Release 3.3.10

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

assets/js/frontend/blocks/build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('@woocommerce/blocks-registry', 'react', 'wp-polyfill'), 'version' => '462b4016eb3699d922cf');
+<?php return array('dependencies' => array('@woocommerce/blocks-registry', 'react', 'wp-polyfill'), 'version' => '2c623899a9a4f847ea27');

assets/js/frontend/blocks/build/index.js

@@ -47,6 +47,12 @@ jQuery(
 			},
 
 			init : function () {
+				const selected = this.get_selected_payment_method();
+
+				if (selected === 'postfinancecheckout_zero') {
+					return;
+				}
+
 				// Payment methods.
 				this.$checkout_form.off( 'click.woo-postfinancecheckout' ).on(
 					'click.woo-postfinancecheckout',

assets/js/frontend/checkout.js

@@ -928,3 +928,12 @@ Please ensure that in woocommerce->settings->tax, the "Round tax at subtotal lev
 - [Tested Against] Woocommerce 9.8.2
 - [Tested Against] PHP SDK 4.8.0
 
+= 3.3.10 - May 13th 2025 =
+- [Bugfix] Fix to allow bulk order updates
+- [Bugfix] Process 0 amount transactions correctly
+- [Bugfix] Fix email sending at the correct time (when payment authorized and paid)
+- [Tested Against] PHP 8.2
+- [Tested Against] Wordpress 6.7
+- [Tested Against] Woocommerce 9.8.5
+- [Tested Against] PHP SDK 4.8.0
+

changelog.txt

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

docs/en/documentation.html

@@ -205,7 +205,7 @@ public function get_default_settings() {
 		$settings = array(
 			array(
 				'links' => array(
-					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.9/docs/en/documentation.html' => esc_html__( 'Documentation', 'woo-postfinancecheckout' ),
+					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.10/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/admin/class-wc-postfinancecheckout-admin-settings-page.php

@@ -57,7 +57,7 @@ public function is_active() {
 	 */
 	public function get_payment_method_script_handles() {
 		$dependencies = array();
-		$version = '1';
+		$version = '3.3.10';
 
 		wp_register_script(
 			'WooCommerce_PostFinanceCheckout_blocks_support',
@@ -108,6 +108,7 @@ public static function get_payment_methods(): array {
 			}
 
 			$payment_gateways = WC()->payment_gateways()->payment_gateways();
+
 			$available_payment_methods = WC_PostFinanceCheckout_Service_Transaction::instance()->get_possible_payment_methods_for_cart();
 
 			$payment_plugin = array_filter(
@@ -118,7 +119,15 @@ public static function get_payment_methods(): array {
 
 			$payments_list =
 			  array_map(
-				function ( WC_PostFinanceCheckout_Gateway $payment_gateway ) use ( $available_payment_methods ) {
+				function ( $payment_gateway ) use ( $available_payment_methods ) {
+					$has_subscription = WC_PostFinanceCheckout_Zero_Gateway::cart_has_subscription();
+					$cartTotal = (WC()->cart && WC()->cart->total) ?? 0;
+					$isPaymentMethodVisibleOnCheckout = $payment_gateway->get_payment_configuration_id() === WC_PostFinanceCheckout_Zero_Gateway::ZERO_PAYMENT_CONF_ID && $cartTotal == 0;
+
+					if ( !$isPaymentMethodVisibleOnCheckout ) {
+						$isPaymentMethodVisibleOnCheckout = in_array( $payment_gateway->get_payment_configuration_id(), $available_payment_methods, true ) && ( $cartTotal > 0 || $has_subscription );
+					}
+
 					return array(
 					  'name' => $payment_gateway->id,
 					  'label' => $payment_gateway->get_title(),
@@ -128,7 +137,7 @@ function ( WC_PostFinanceCheckout_Gateway $payment_gateway ) use ( $available_pa
 					  'integration_mode' => get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ),
 					  'supports' => $payment_gateway->supports,
 					  'icon' => $payment_gateway->get_icon(),
-					  'isActive' => in_array( $payment_gateway->get_payment_configuration_id(), $available_payment_methods, true )
+					  'isActive' => $isPaymentMethodVisibleOnCheckout
 					);
 				},
 				$payment_plugin
@@ -195,18 +204,17 @@ public static function enqueue_portal_scripts() {
 			$transaction_service = WC_PostFinanceCheckout_Service_Transaction::instance();
 			$transaction = $transaction_service->get_transaction_from_session();
 
-			switch( get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ) ) {
-				case WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_IFRAME:
-					// Ask the portal for the iframe's javascript file.
-					$js_url = $transaction_service->get_javascript_url_for_transaction( $transaction );
-					break;
-				case WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_LIGHTBOX:
-					$js_url = $transaction_service->get_lightbox_url_for_transaction( $transaction );
-					// Ask the portal for the lighbox's javascript file.
-					break;
-				default:
-					$js_url = '';
-					break;
+			$js_url = '';
+			$zeroPaymentMethod = new WC_PostFinanceCheckout_Zero_Gateway();
+			if ( !$zeroPaymentMethod->is_available() || $zeroPaymentMethod->cart_has_subscription() ) {
+				switch( get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_INTEGRATION ) ) {
+					case WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_IFRAME:
+						$js_url = $transaction_service->get_javascript_url_for_transaction( $transaction );
+						break;
+					case WC_PostFinanceCheckout_Integration::POSTFINANCECHECKOUT_LIGHTBOX:
+						$js_url = $transaction_service->get_lightbox_url_for_transaction( $transaction );
+						break;
+				}
 			}
 
 			if ( $js_url ) {
@@ -250,6 +258,7 @@ public static function process_payment( PaymentContext $context, PaymentResult &
 		if ( ! $payment_method_object instanceof \WC_PostFinanceCheckout_Gateway ) {
 			return;
 		}
+
 		$payment_method_object->validate_fields();
 
 		// We call here the payment processor from our gateway.

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

@@ -14,6 +14,8 @@
  * @license  http://www.apache.org/licenses/LICENSE-2.0 Apache Software License (ASL 2.0)
  */
 
+use PostFinanceCheckout\Sdk\Model\TransactionState;
+
 defined( 'ABSPATH' ) || exit;
 
 /**
@@ -27,6 +29,15 @@ class WC_PostFinanceCheckout_Email {
 	 * Register email hooks.
 	 */
 	public static function init() {
+		add_action(
+			'postfinancecheckout_transaction_authorized_send_email',
+			array(
+				__CLASS__,
+		  		'send_on_hold_email_when_authorized'
+			),
+			10,
+			1
+		);
 		add_filter(
 			'woocommerce_email_enabled_new_order',
 			array(
@@ -143,6 +154,27 @@ public static function init() {
 		add_filter( 'woocommerce_email_classes', array( __CLASS__, 'add_email_classes' ), 100, 1 );
 	}
 
+	/**
+	 * @param $order_id
+	 * @return void
+	 */
+	public static function send_on_hold_email_when_authorized( $order_id ) {
+		$order = wc_get_order( $order_id );
+		if ( ! $order instanceof WC_Order ) {
+			return;
+		}
+
+		$emails = WC()->mailer()->get_emails();
+		if ( isset( $emails['WC_Email_Customer_On_Hold_Order'] ) ) {
+			$emails['WC_Email_Customer_On_Hold_Order']->trigger( $order_id );
+			update_post_meta( $order_id, '_postfinancecheckout_on_hold_email_sent', true );
+		}
+
+		if ( isset( $emails['WC_Email_New_Order'] ) ) {
+			$emails['WC_Email_New_Order']->trigger( $order_id );
+		}
+	}
+
 	/**
 	 * Sends emails.
 	 *
@@ -161,7 +193,11 @@ public static function send_email_for_order( $enabled, $order ) {
 		if ( $gateway instanceof WC_PostFinanceCheckout_Gateway ) {
 			$send = get_option( WooCommerce_PostFinanceCheckout::POSTFINANCECHECKOUT_CK_SHOP_EMAIL, 'yes' );
 			if ( 'yes' !== $send ) {
-				return false;
+				return;
+			}
+
+			if ( ! self::is_authorized_on_hold_order( $order ) ) {
+				return;
 			}
 		}
 		return $enabled;
@@ -317,6 +353,11 @@ public static function check_germanized_pay_email_trigger( $order_id, $order = f
 			if ( 'yes' !== $send ) {
 				return;
 			}
+
+			if ( ! self::is_authorized_on_hold_order( $order ) ) {
+				return;
+			}
+
 			$mails = WC()->mailer()->get_emails();
 			if ( isset( $mails['WC_GZD_Email_Customer_Paid_For_Order'] ) ) {
 				$mails['WC_GZD_Email_Customer_Paid_For_Order']->trigger( $order_id );
@@ -404,8 +445,29 @@ public static function germanized_send_order_confirmation( $email_sent, $order_i
 				return true;
 			}
 		}
+
+		if ( ! self::is_authorized_on_hold_order( $order ) ) {
+			return;
+		}
 		return $email_sent;
 	}
+
+	/**
+	 * @param WC_Order $order
+	 * @return bool
+	 */
+	private static function is_authorized_on_hold_order( WC_Order $order ) {
+		if ( $order->get_status() !== 'on-hold' ) {
+			return true;
+		}
+
+		$transaction_info = WC_PostFinanceCheckout_Entity_Transaction_Info::load_by_order_id( $order->get_id() );
+		if ( ! $transaction_info || ( $transaction_info->get_state() !== TransactionState::AUTHORIZED ) ) {
+			return false;
+		}
+
+		return true;
+	}
 }
 
 WC_PostFinanceCheckout_Email::init();

includes/class-wc-postfinancecheckout-email.php

@@ -268,7 +268,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.9/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.10/docs/en/documentation.html" aria-label="' . esc_html__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
 			);
 
 			return array_merge( $links, $row_meta );