Release 3.3.14

Author: andrewrowanwallee

README.md

@@ -14,7 +14,7 @@ This repository contains the PostFinance Checkout plugin that enables WooCommerc
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.13/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.14/docs/en/documentation.html)
 
 ## Support
 
@@ -25,13 +25,13 @@ Support queries can be issued on the [PostFinance Checkout support site](https:/
 ____________________________________________________________________________
 | WooCommerce version    | Plugin major version   | Supported until        |
 |------------------------|------------------------|------------------------|
-| 8.x, 9.x               | 3.x                    | Further notice         |
+| 8.x, 9.x, 10.x         | 3.x                    | Further notice         |
 | 7.x                    | 2.x                    | Feb 2024               |
 ----------------------------------------------------------------------------
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.3.13/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.3.14/LICENSE) for more information.
 
 ## Privacy Policy
 

changelog.txt

@@ -962,3 +962,16 @@ Please ensure that in woocommerce->settings->tax, the "Round tax at subtotal lev
 - [Tested Against] Woocommerce 9.9.5
 - [Tested Against] PHP SDK 4.8.0
 
+= 3.3.14 - July 22nd 2025 =
+- [Bugfix] Fix class loading order issues
+- [Bugfix] Fix problem with multisite not installing tables when plugin is network activated
+- [Bugfix] Fix missing payment methods if subscription price is 0
+- [Bugfix] Fix for failed subscriptions renewals if subscription contains a discount
+- [Bugfix] Fix for iframe payment fields not loading on delivery method change
+- [Feature] Added plugin version metric
+- [Feature] Send order notes to portal
+- [Tested Against] PHP 8.2
+- [Tested Against] Wordpress 6.7
+- [Tested Against] Woocommerce 10.0.0
+- [Tested Against] PHP SDK 4.8.0
+

docs/en/documentation.html

@@ -23,7 +23,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.3.13/">
+		<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.3.14/">
 			Source
 		</a>
 	</li>

includes/admin/class-wc-postfinancecheckout-admin-settings-page.php

@@ -205,7 +205,7 @@ public function get_default_settings() {
 		$settings = array(
 			array(
 				'links' => array(
-					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.13/docs/en/documentation.html' => esc_html__( 'Documentation', 'woo-postfinancecheckout' ),
+					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.14/docs/en/documentation.html' => esc_html__( 'Documentation', 'woo-postfinancecheckout' ),
 					'https://checkout.postfinance.ch/en-ch/user/signup' => esc_html__( 'Sign Up', 'woo-postfinancecheckout' ),
 				),
 				'type'  => 'postfinancecheckout_links',
@@ -408,6 +408,25 @@ public function get_default_settings() {
 				'id' => 'reference_options',
 			),
 
+			array(
+				'title' => esc_html__( 'Virtual Order Status Options', 'woo-postfinancecheckout' ),
+				'type' => 'title',
+				'id' => 'order_status_options',
+			),
+
+			array(
+				'title' => esc_html__( 'Change Virtual Order Status On Completion', 'woo-postfinancecheckout' ),
+				'desc' => esc_html__( 'Enable this setting to automatically set order\'s status to "Completed" when they consist entirely out of virtual products and order\'s total is 0.', 'woo-postfinancecheckout' ),
+				'id' => WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_CHANGE_ORDER_STATUS,
+				'type' => 'checkbox',
+				'default' => 'yes',
+				'css' => 'min-width:300px;',
+			),
+
+			array(
+				'type' => 'sectionend',
+				'id' => 'order_status_options',
+			),
 		);
 
 		return apply_filters( 'postfinancecheckout_settings', $settings );

includes/class-wc-postfinancecheckout-blocks-support.php

@@ -57,7 +57,7 @@ public function is_active() {
 	 */
 	public function get_payment_method_script_handles() {
 		$dependencies = array();
-		$version = '3.3.13';
+		$version = '3.3.14';
 
 		wp_register_script(
 			'WooCommerce_PostFinanceCheckout_blocks_support',

includes/class-wc-postfinancecheckout-gateway.php

@@ -140,6 +140,8 @@ public function __construct( WC_PostFinanceCheckout_Entity_Method_Configuration
 			)
 		);
 
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_checkout_scripts' ) );
+
 		$this->supports = array(
 			'products',
 			'refunds',
@@ -433,7 +435,7 @@ protected function get_safe_possible_payment_methods_for_cart() {
 			WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
 		}
 
-		return false;
+		return array();
 	}
 
 	/**
@@ -473,7 +475,6 @@ public function payment_fields() {
 
 		parent::payment_fields();
 		$transaction_service = WC_PostFinanceCheckout_Service_Transaction::instance();
-		$woocommerce_data = get_plugin_data( WP_PLUGIN_DIR . '/woocommerce/woocommerce.php', false, false );
 		try {
 			if ( apply_filters( 'wc_postfinancecheckout_is_order_pay_endpoint', is_checkout_pay_page() ) ) { //phpcs:ignore
 				global $wp;
@@ -485,49 +486,6 @@ public function payment_fields() {
 			} else {
 				$transaction = $transaction_service->get_transaction_from_session();
 			}
-			if ( ! wp_script_is( 'postfinancecheckout-remote-checkout-js', 'enqueued' ) ) {
-				$ajax_url = $transaction_service->get_javascript_url_for_transaction( $transaction );
-				// !isset($wp->query_vars['order-pay'])->If you're not in the "re-pay" checkout.
-				if (
-					( get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ) == WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_LIGHTBOX )
-					&& ( is_checkout()
-					&& ! isset( $wp->query_vars['order-pay'] ) )
-				) {
-					$ajax_url = $transaction_service->get_lightbox_url_for_transaction( $transaction );
-				}
-				wp_enqueue_script(
-					'postfinancecheckout-remote-checkout-js',
-					$ajax_url,
-					array(
-						'jquery',
-					),
-					1,
-					true
-				);
-				wp_enqueue_script(
-					'postfinancecheckout-checkout-js',
-					WooCommerce_PostFinanceCheckout::instance()->plugin_url() . '/assets/js/frontend/checkout.js',
-					array(
-						'jquery',
-						'jquery-blockui',
-						'postfinancecheckout-remote-checkout-js',
-					),
-					1,
-					true
-				);
-				global $wp_version;
-				$localize = array(
-					'i18n_not_complete' => esc_html__( 'Please fill out all required fields.', 'woo-postfinancecheckout' ),
-					'integration' => get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ),
-					'versions' => array(
-						'wordpress' => $wp_version,
-						'woocommerce' => $woocommerce_data['Version'],
-						'postfinancecheckout' => WC_POSTFINANCECHECKOUT_VERSION,
-					),
-				);
-				wp_localize_script( 'postfinancecheckout-checkout-js', 'postfinancecheckout_js_params', $localize );
-
-			}
 			$transaction_nonce = hash_hmac( 'sha256', $transaction->getLinkedSpaceId() . '-' . $transaction->getId(), NONCE_KEY );
 
 			?>
@@ -550,6 +508,70 @@ class="postfinancecheckout-method-configuration" style="display: none;"
 		}
 	}
 
+	public function enqueue_checkout_scripts() {
+
+		$transaction_service = WC_PostFinanceCheckout_Service_Transaction::instance();
+		$woocommerce_data = get_plugin_data( WP_PLUGIN_DIR . '/woocommerce/woocommerce.php', false, false );
+		if ( apply_filters( 'wc_postfinancecheckout_is_order_pay_endpoint', is_checkout_pay_page() ) ) { //phpcs:ignore
+			global $wp;
+			$order = WC_Order_Factory::get_order( $wp->query_vars['order-pay'] );
+			if ( ! $order ) {
+				return false;
+			}
+			$transaction = $transaction_service->get_transaction_from_order( $order );
+		} else {
+			$transaction = $transaction_service->get_transaction_from_session();
+		}
+		if ( ! wp_script_is( 'postfinancecheckout-remote-checkout-js', 'enqueued' ) ) {
+			$ajax_url = $transaction_service->get_javascript_url_for_transaction( $transaction );
+			// !isset($wp->query_vars['order-pay'])->If you're not in the "re-pay" checkout.
+			if (
+			  ( get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ) == WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_LIGHTBOX )
+			  && ( is_checkout()
+				&& ! isset( $wp->query_vars['order-pay'] ) )
+			) {
+				$ajax_url = $transaction_service->get_lightbox_url_for_transaction( $transaction );
+			}
+
+            if (get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ) == WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_PAYMENTPAGE) {
+                return false;
+			}
+
+			wp_enqueue_script(
+			  'postfinancecheckout-remote-checkout-js',
+			  $ajax_url,
+			  array(
+				'jquery',
+			  ),
+			  1,
+			  true
+			);
+			wp_enqueue_script(
+			  'postfinancecheckout-checkout-js',
+			  WooCommerce_PostFinanceCheckout::instance()->plugin_url() . '/assets/js/frontend/checkout.js',
+			  array(
+				'jquery',
+				'jquery-blockui',
+				'postfinancecheckout-remote-checkout-js',
+			  ),
+			  1,
+			  true
+			);
+			global $wp_version;
+			$localize = array(
+			  'i18n_not_complete' => esc_html__( 'Please fill out all required fields.', 'woo-postfinancecheckout' ),
+			  'integration' => get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ),
+			  'versions' => array(
+				'wordpress' => $wp_version,
+				'woocommerce' => $woocommerce_data['Version'],
+				'postfinancecheckout' => WC_POSTFINANCECHECKOUT_VERSION,
+			  ),
+			);
+			wp_localize_script( 'postfinancecheckout-checkout-js', 'postfinancecheckout_js_params', $localize );
+
+		}
+	}
+
 	/**
 	 * Validate frontend fields.
 	 *

includes/class-wc-postfinancecheckout-helper.php

@@ -27,6 +27,7 @@ class WC_PostFinanceCheckout_Helper {
 	const POSTFINANCECHECKOUT_CHECKOUT_VERSION = 'x-checkout-type';
 	const POSTFINANCECHECKOUT_CHECKOUT_TYPE_BLOCKS = 'blocks';
 	const POSTFINANCECHECKOUT_CHECKOUT_TYPE_LEGACY = 'legacy';
+	const POSTFINANCECHECKOUT_PLUGIN_VERSION = 'x-meta-plugin-version';
 
 	/**
 	 * Instance.
@@ -236,9 +237,14 @@ public function get_total_amount_including_tax( array $line_items, bool $exclude
 	 * @return \PostFinanceCheckout\Sdk\Model\LineItemCreate[]
 	 * @throws WC_PostFinanceCheckout_Exception_Invalid_Transaction_Amount WC_PostFinanceCheckout_Exception_Invalid_Transaction_Amount.
 	 */
-	public function cleanup_line_items( array $line_items, $expected_sum, $currency ) {
+	public function cleanup_line_items( array $line_items, $expected_sum, $currency, bool $is_recurrent = false ) {
+		// Check if coupon is applied to order depending whether new order is created from session, or existing order.
+		if ( $is_recurrent ) {
+			$has_coupons = apply_filters( 'wc_postfinancecheckout_packages_coupon_line_items_have_coupon_discounts', $line_items, $currency );
+		} else {
+			$has_coupons = apply_filters( 'wc_postfinancecheckout_packages_coupon_cart_has_coupon_discounts_applied', $currency ); //phpcs:ignore
+		}
 		// ensure that the effective sum coincides with the total discounted by the coupons.
-		$has_coupons = apply_filters( 'wc_postfinancecheckout_packages_coupon_has_coupon_discounts_applied', $currency ); //phpcs:ignore
 		$effective_sum = $this->round_amount( $this->get_total_amount_including_tax( $line_items, $has_coupons ), $currency );
 		$rounded_expected_sum = $this->round_amount( $expected_sum, $currency );
 
@@ -571,11 +577,13 @@ protected static function get_default_header_data() {
 		$version = WC_VERSION;
 
 		$shop_version = str_replace( 'v', '', $version );
+		$plugin_version = '3.3.14';
 		list ($major_version, $minor_version) = explode( '.', $shop_version, 3 );
 		return array(
 			self::POSTFINANCECHECKOUT_SHOP_SYSTEM => 'woocommerce',
 			self::POSTFINANCECHECKOUT_SHOP_SYSTEM_VERSION => $shop_version,
 			self::POSTFINANCECHECKOUT_SHOP_SYSTEM_AND_VERSION => 'woocommerce-' . $major_version . '.' . $minor_version,
+			self::POSTFINANCECHECKOUT_PLUGIN_VERSION => $plugin_version,
 		);
 	}
 
@@ -624,20 +632,33 @@ public function get_woocommerce_order_statuses_json() {
 	 * @param $order
 	 * @return void
 	 */
-	public static function set_virtual_orders_to_complete( $order ) {
+	public static function set_virtual_zero_total_orders_to_complete( $order ) {
+		if ( 'yes' === get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_CHANGE_ORDER_STATUS ) 
+		&& $order->get_total() <= 0 && self::is_order_virtual( $order ) ) {
+			$order->update_status( 'completed' );
+		}
+	}
+
+	/**
+	 * @param $order
+	 * @return bool
+	 */
+	public static function is_order_virtual( $order ) {
+		if ( ! $order instanceof WC_Order ) {
+			$order = wc_get_order( $order );
+		}
+
+		if ( ! $order ) {
+			return false;
+		}
 
-		$only_virtual = true;
 		foreach ( $order->get_items() as $item ) {
 			$product = $item->get_product();
 			if ( ! $product || ! $product->is_virtual() ) {
-				$only_virtual = false;
-				break;
+				return false;
 			}
 		}
-
-		if ( $only_virtual ) {
-			$order->update_status( 'completed' );
-		}
+		return true;
 	}
 
 	/**

includes/class-wc-postfinancecheckout-migration.php

@@ -69,11 +69,13 @@ public static function init() {
 			5
 		);
 		add_action(
-			'wpmu_new_blog',
+			'wp_initialize_site',
 			array(
 				__CLASS__,
-				'wpmu_new_blog',
-			)
+				'wp_initialize_site'
+			),
+			10,
+			2
 		);
 		add_filter(
 			'wpmu_drop_tables',
@@ -176,16 +178,23 @@ private static function check_requirements() {
 	/**
 	 * Create tables if new MU blog is created
 	 *
-	 * @param  mixed $blog_id blog id.
-	 * @param  mixed $user_id user id.
-	 * @param  mixed $domain domain.
-	 * @param  mixed $path path.
-	 * @param  mixed $site_id site id.
-	 * @param  mixed $meta meta.
+	 * wp_initialize_site hook introduced since 5.1.0
+	 * @link https://developer.wordpress.org/reference/hooks/wp_initialize_site/
+	 *
+	 * @param WP_Site $site
+	 * @param array $args
+	 * @return void
 	 */
-	public static function wpmu_new_blog( $blog_id, $user_id, $domain, $path, $site_id, $meta ) { //phpcs:ignore
-
+	public static function wp_initialize_site( WP_Site $site, array $args ) { //phpcs:ignore
 		if ( is_plugin_active_for_network( 'woo-postfinancecheckout/woocommerce-postfinancecheckout.php' ) ) {
+			$blog_id = $site->blog_id;
+			// Defensive check: blog_id should always be set, otherwise will be shown as postfinancecheckout error
+			if ( ! $blog_id ) {
+				$logger = wc_get_logger();
+				$logger->error( 'Could not detect blog_id during wp_initialize_site.', [ 'source' => 'postfinancecheckout' ] );
+				return;
+			}
+
 			switch_to_blog( $blog_id );
 			self::migrate_db();
 			restore_current_blog();
@@ -268,7 +277,7 @@ public static function check_version() {
 	public static function plugin_row_meta( $links, $file ) {
 		if ( WC_POSTFINANCECHECKOUT_PLUGIN_BASENAME === $file ) {
 			$row_meta = array(
-				'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.13/docs/en/documentation.html" aria-label="' . esc_html__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
+				'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.14/docs/en/documentation.html" aria-label="' . esc_html__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
 			);
 
 			return array_merge( $links, $row_meta );

includes/class-wc-postfinancecheckout-order-status-adapter.php

@@ -374,6 +374,12 @@ public function update_order_status( WC_Order $order, ?string $status, ?string $
 	 */
 	public function get_order_status_on_payment_complete( string $status, int $order_id, WC_Order $order ): string
 	{
+		// If order consists entirely out of virtual products and their total is 0, change their status to completed
+		if ( 'yes' === get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_CHANGE_ORDER_STATUS ) 
+		&& $order->get_total() <= 0 && WC_PostFinanceCheckout_Helper::is_order_virtual( $order ) ) {
+			return self::POSTFINANCECHECKOUT_STATUS_COMPLETED;
+		}
+		
 		// Check if the transaction status is mapped in WooCommerce
 		$mapped_status = $this->map_postfinancecheckout_status_to_woocommerce( \PostFinanceCheckout\Sdk\Model\TransactionState::FULFILL );