Release 3.3.11

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.10/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.11/docs/en/documentation.html)
 
 ## Support
 
@@ -31,7 +31,7 @@ ____________________________________________________________________________
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.3.10/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.3.11/LICENSE) for more information.
 
 ## Privacy Policy
 

changelog.txt

@@ -937,3 +937,12 @@ Please ensure that in woocommerce->settings->tax, the "Round tax at subtotal lev
 - [Tested Against] Woocommerce 9.8.5
 - [Tested Against] PHP SDK 4.8.0
 
+= 3.3.10 - June 3rd 2025 =
+- [Bugfix] Fixed bug with overriding alternate order statuses
+- [Bugfix] Fixed bug with virtual products not goint into correct status
+- [Feature] Improved checkout speed, especially when using Germanized plugin
+- [Tested Against] PHP 8.2
+- [Tested Against] Wordpress 6.7
+- [Tested Against] Woocommerce 9.8.5
+- [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.10/">
+		<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.3.11/">
 			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.10/docs/en/documentation.html' => esc_html__( 'Documentation', 'woo-postfinancecheckout' ),
+					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.11/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',

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.10';
+		$version = '3.3.11';
 
 		wp_register_script(
 			'WooCommerce_PostFinanceCheckout_blocks_support',

includes/class-wc-postfinancecheckout-gateway.php

@@ -323,118 +323,136 @@ public function validate_info_field( $key, $value ) {}
 	 * @return bool
 	 */
 	public function is_available() {
-		$is_available = parent::is_available();
-
-		if ( ! $is_available ) {
-			return false;
+		static $checking = false;
+		if ( $checking ) {
+			return false; // prevent reentry/loop
 		}
-
-		// It's not possible to support the rounding on subtotal level and still get valid tax rates and amounts.
-		// Therefore the payment methods are disabled, if this option is active.
-		if ( wc_tax_enabled() && ( 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' ) ) ) {
-			if ( 'yes' === get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_ENFORCE_CONSISTENCY ) ) {
-				$error_message = esc_html__( "'WooCommerce > Settings > PostFinanceCheckout > Enforce Consistency' and 'WooCommerce > Settings > Tax > Rounding' are both enabled. Please disable at least one of them.", 'woo-postfinancecheckout' );
-				WooCommerce_PostFinanceCheckout::instance()->log( $error_message, WC_Log_Levels::ERROR );
+		$checking = true;
+	
+		try {
+			// Step 1: Respect parent availability
+			if ( ! parent::is_available() ) {
 				return false;
 			}
-		}
-
-		// It is possbile this function is called in the WordPress admin section. There is not a cart, so all active methods are available.
-		// If it is not a checkout page the method is availalbe. Some plugins check this, on non checkout pages, without a cart available.
-		// The active  gateways are  available during order total caluclation, as other plugins could need them.
-		if (
-			apply_filters(
+	
+			// Step 2: Prevent conflict with tax rounding
+			if ( wc_tax_enabled() && 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' ) ) {
+				if ( 'yes' === get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_ENFORCE_CONSISTENCY ) ) {
+					$error_message = esc_html__( "'WooCommerce > Settings > PostFinanceCheckout > Enforce Consistency' and 'WooCommerce > Settings > Tax > Rounding' are both enabled. Please disable at least one of them.", 'woo-postfinancecheckout' );
+					WooCommerce_PostFinanceCheckout::instance()->log( $error_message, WC_Log_Levels::ERROR );
+					return false;
+				}
+			}
+	
+			// Step 3: Use session cache if available
+			$gateway_available = WC()->session && WC()->session->has_session()
+				? WC()->session->get( 'postfinancecheckout_payment_gateways' )
+				: array();
+	
+			if ( isset( $gateway_available[ $this->wle_payment_method_configuration_id ] ) ) {
+				return $gateway_available[ $this->wle_payment_method_configuration_id ];
+			}
+	
+			// Step 4: Allow admin and non-checkout pages to pass
+			if ( apply_filters(
 				'postfinancecheckout_is_method_available',
-				is_admin()
-				|| ! is_checkout()
-				|| ( isset( $GLOBALS['_postfinancecheckout_calculating'] )
-					&& $GLOBALS['_postfinancecheckout_calculating']
-					),
+				is_admin() || ! is_checkout() || ( isset( $GLOBALS['_postfinancecheckout_calculating'] ) && $GLOBALS['_postfinancecheckout_calculating'] ),
 				$this
-			)
-		) {//phpcs:ignore
-			return $this->get_payment_method_configuration()->get_state() == WC_PostFinanceCheckout_Entity_Method_Configuration::POSTFINANCECHECKOUT_STATE_ACTIVE;
-		}
-
-		global $wp;
-		if ( is_checkout() && isset( $wp->query_vars['order-received'] ) ) {
-			// Sometimes, when the Thank you page is loaded, there are new attempts to get
-			// gateways availability. In this particular case, we retrieve the availability
-			// information from the session, so the plugin does not have to ask the portal
-			// for this information, creating an unused transaction in the process.
-			$gateway_available = WC()->session->get( 'postfinancecheckout_payment_gateways' );
-			if ( ! empty( $gateway_available[ $this->pfc_payment_method_configuration_id ] ) ) {
-				return $gateway_available[ $this->pfc_payment_method_configuration_id ];
+			) ) {
+				return $this->get_payment_method_configuration()->get_state() === WC_PostFinanceCheckout_Entity_Method_Configuration::POSTFINANCECHECKOUT_STATE_ACTIVE;
+			}
+	
+			// Step 5: Handle "order received" page logic
+			global $wp;
+			if ( is_checkout() && isset( $wp->query_vars['order-received'] ) ) {
+				return ! empty( $gateway_available[ $this->wle_payment_method_configuration_id ] );
+			}
+	
+			// Step 6: Handle "order pay" endpoint
+			if ( apply_filters( 'wc_postfinancecheckout_is_order_pay_endpoint', is_checkout_pay_page() ) ) {
+				$order = WC_Order_Factory::get_order( $wp->query_vars['order-pay'] ?? 0 );
+				if ( ! $order ) {
+					return false;
+				}
+				$possible_methods = $this->get_safe_possible_payment_methods_for_order( $order );
 			} else {
-
-				return false;
+				$possible_methods = $this->get_safe_possible_payment_methods_for_cart();
 			}
-		}
-
-		if ( apply_filters( 'wc_postfinancecheckout_is_order_pay_endpoint', is_checkout_pay_page() ) ) { //phpcs:ignore
-			// We have to use the order and not the cart for this endpoint.
-			$order = WC_Order_Factory::get_order( $wp->query_vars['order-pay'] );
-			if ( ! $order ) {
-				return false;
+	
+			// Step 7: Check if this gateway is among the possible ones
+			$possible = false;
+			foreach ( $possible_methods as $method_id ) {
+				if ( $method_id == $this->get_payment_method_configuration()->get_configuration_id() ) {
+					$possible = true;
+					break;
+				}
 			}
-			try {
-				$possible_methods = WC_PostFinanceCheckout_Service_Transaction::instance()->get_possible_payment_methods_for_order( $order );
-			} catch ( WC_PostFinanceCheckout_Exception_Invalid_Transaction_Amount $e ) {
-				WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage() . ' Order Id: ' . $order->get_id(), WC_Log_Levels::ERROR );
-				return false;
-			} catch ( Exception $e ) {
-				WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
+	
+			if ( ! $possible ) {
 				return false;
 			}
-		} else {
-			if ( $this->have_already_entered === true ) {
-				return true;
+	
+			// Step 8: Cache success in session
+			if ( WC()->session && WC()->session->has_session() ) {
+				$gateway_available[ $this->wle_payment_method_configuration_id ] = true;
+				WC()->session->set( 'postfinancecheckout_payment_gateways', $gateway_available );
 			}
+	
+			return true;
+	
+		} finally {
+			$checking = false;
+		}
+	}
 
-			$this->have_already_entered = true;
-
-			try {
-				$possible_methods = WC_PostFinanceCheckout_Service_Transaction::instance()->get_possible_payment_methods_for_cart();
-			} catch ( WC_PostFinanceCheckout_Exception_Invalid_Transaction_Amount $e ) {
-				WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::ERROR );
-				return false;
-			} catch ( \PostFinanceCheckout\Sdk\ApiException $e ) {
-				WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
-				$response_object = $e->getResponseObject();
-				$is_client_error = ( $response_object instanceof \PostFinanceCheckout\Sdk\Model\ClientError );
-				if ( $is_client_error ) {
-					$error_types = array( 'CONFIGURATION_ERROR', 'DEVELOPER_ERROR' );
-					if ( in_array( $response_object->getType(), $error_types ) ) {
-						$message = esc_attr( $response_object->getType() ) . ': ' . esc_attr( $response_object->getMessage() );
-						wc_print_notice( $message, 'error' );
-						return false;
-					}
+	/**
+	 * Safely fetches possible payment methods for the current cart.
+	 *
+	 * Handles known exceptions to prevent issues during cart calculation
+	 * (especially important for avoiding loops with plugins like Germanized).
+	 *
+	 * @return array|false Array of method configuration IDs if successful, false on failure.
+	 */
+	protected function get_safe_possible_payment_methods_for_cart() {
+		try {
+			return WC_PostFinanceCheckout_Service_Transaction::instance()->get_possible_payment_methods_for_cart();
+		} catch ( WC_PostFinanceCheckout_Exception_Invalid_Transaction_Amount $e ) {
+			WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::ERROR );
+		} catch ( \PostFinanceCheckout\Sdk\ApiException $e ) {
+			WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
+			$response_object = $e->getResponseObject();
+			$is_client_error = ( $response_object instanceof \PostFinanceCheckout\Sdk\Model\ClientError );
+			if ( $is_client_error ) {
+				$error_types = array( 'CONFIGURATION_ERROR', 'DEVELOPER_ERROR' );
+				if ( in_array( $response_object->getType(), $error_types ) ) {
+					$message = esc_attr( $response_object->getType() ) . ': ' . esc_attr( $response_object->getMessage() );
+					wc_print_notice( $message, 'error' );
 				}
-				return false;
-			} catch ( Exception $e ) {
-				WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
-				return false;
-			} finally {
-				$this->have_already_entered = false;
 			}
+		} catch ( Exception $e ) {
+			WooCommerce_PostFinanceCheckout::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
 		}
+	
+		return false;
+	}
 
-		$possible = false;
-		foreach ( $possible_methods as $possible_method ) {
-			if ( $possible_method == $this->get_payment_method_configuration()->get_configuration_id() ) {
-				$possible = true;
-				break;
-			}
-		}
-		if ( ! $possible ) {
-			return false;
+	/**
+	 * Safely fetches possible payment methods for a given WooCommerce order.
+	 *
+	 * Primarily used on the "order pay" endpoint where cart isn't available.
+	 *
+	 * @param WC_Order $order WooCommerce order object.
+	 * @return array|false Array of method configuration IDs if successful, false on failure.
+	 */
+	protected function get_safe_possible_payment_methods_for_order( $order ) {
+		try {
+			return WC_Wallee_Service_Transaction::instance()->get_possible_payment_methods_for_order( $order );
+		} catch ( WC_Wallee_Exception_Invalid_Transaction_Amount $e ) {
+			WooCommerce_Wallee::instance()->log( $e->getMessage() . ' Order Id: ' . $order->get_id(), WC_Log_Levels::ERROR );
+		} catch ( Exception $e ) {
+			WooCommerce_Wallee::instance()->log( $e->getMessage(), WC_Log_Levels::DEBUG );
 		}
-
-		// Store the availability information in the session.
-		$gateway_available = WC()->session->get( 'postfinancecheckout_payment_gateways' );
-		$gateway_available[ $this->pfc_payment_method_configuration_id ] = true;
-		WC()->session->set( 'postfinancecheckout_payment_gateways', $gateway_available );
-		return true;
+		return false;
 	}
 
 	/**