Merge branch 'try/subs-notifications-pf' of https://github.com/Automattic/woocommerce-subscriptions-core into try/subs-notifications-pf

Author: peterfabian

changelog.txt

@@ -1,5 +1,9 @@
 *** WooCommerce Subscriptions Core Changelog ***
 
+= 7.4.0 - 2024-xx-xx =
+* Update - Schedule subscription-related events with a priority of 1 to allow for earlier execution within the Action Scheduler.
+* Fix - Ensure admin notices are displayed after performing bulk actions on subscriptions when HPOS is enabled.
+
 = 7.3.0 - 2024-07-16 =
 * Fix - Label improvements on subscription and order page templates.
 * Fix - Fixed an issue with subscriptions containing multiple renewal orders to mark a random item as processing, instead of the last order.

includes/class-wcs-action-scheduler.php

@@ -10,6 +10,16 @@
  */
 class WCS_Action_Scheduler extends WCS_Scheduler {
 
+	/**
+	 * The action scheduler group to use for scheduled subscription events.
+	 */
+	const ACTION_GROUP = 'wc_subscription_scheduled_event';
+
+	/**
+	 * The priority of the subscription-related scheduled action.
+	 */
+	const ACTION_PRIORITY = 1;
+
 	/**
 	 * An internal cache of action hooks and corresponding date types.
 	 *
@@ -55,7 +65,7 @@ public function update_date( $subscription, $date_type, $datetime ) {
 
 					// Only schedule it if it's valid. It's active, it's a payment retry or it's pending cancelled and the end date being updated.
 					if ( 'payment_retry' === $date_type || $subscription->has_status( 'active' ) || ( $subscription->has_status( 'pending-cancel' ) && 'end' === $date_type ) ) {
-						as_schedule_single_action( $timestamp, $action_hook, $action_args );
+						$this->schedule_action( $timestamp, $action_hook, $action_args );
 					}
 				}
 			}
@@ -110,7 +120,7 @@ public function update_status( $subscription, $new_status, $old_status ) {
 					}
 
 					if ( 0 != $event_time && $event_time > current_time( 'timestamp', true ) && $next_scheduled !== $event_time ) {
-						as_schedule_single_action( $event_time, $action_hook, $action_args );
+						$this->schedule_action( $event_time, $action_hook, $action_args );
 					}
 				}
 
@@ -139,7 +149,7 @@ public function update_status( $subscription, $new_status, $old_status ) {
 
 				// The end date was set in WC_Subscriptions::update_dates() to the appropriate value, so we can schedule our action for that time
 				if ( $end_time > current_time( 'timestamp', true ) && $next_scheduled !== $end_time ) {
-					as_schedule_single_action( $end_time, 'woocommerce_scheduled_subscription_end_of_prepaid_term', $action_args );
+					$this->schedule_action( $end_time, 'woocommerce_scheduled_subscription_end_of_prepaid_term', $action_args );
 				}
 				break;
 			case 'on-hold':
@@ -226,4 +236,36 @@ protected function get_action_args( $date_type, $subscription ) {
 	protected function unschedule_actions( $action_hook, $action_args ) {
 		as_unschedule_all_actions( $action_hook, $action_args );
 	}
+
+	/**
+	 * Gets the priority of the subscription-related scheduled action.
+	 *
+	 * @return int The priority of the subscription-related scheduled action.
+	 */
+	public function get_action_priority( $action_hook ) {
+		return apply_filters( 'woocommerce_subscriptions_scheduled_action_priority', self::ACTION_PRIORITY, $action_hook );
+	}
+
+	/**
+	 * Schedule an subscription-related action with the Action Scheduler.
+	 *
+	 * Subscription events are scheduled with a priority of 1 (see self::ACTION_PRIORITY) and the
+	 * group 'wc_subscription_scheduled_event' (see self::ACTION_GROUP).
+	 *
+	 * @param int    $timestamp Unix timestamp of when the action should run.
+	 * @param string $action_hook Name of event used as the hook for the scheduled action.
+	 * @param array  $action_args Array of name => value pairs stored against the scheduled action.
+	 *
+	 * @return int The action ID.
+	 */
+	protected function schedule_action( $timestamp, $action_hook, $action_args ) {
+		$as_version = ActionScheduler_Versions::instance()->latest_version();
+
+		// On older versions of Action Scheduler, we cannot specify a priority.
+		if ( version_compare( $as_version, '3.6.0', '<' ) ) {
+			return as_schedule_single_action( $timestamp, $action_hook, $action_args, self::ACTION_GROUP );
+		}
+
+		return as_schedule_single_action( $timestamp, $action_hook, $action_args, self::ACTION_GROUP, false, $this->get_action_priority( $action_hook ) );
+	}
 }

includes/privacy/class-wcs-privacy.php

@@ -124,7 +124,7 @@ public static function add_privacy_bulk_action( $bulk_actions ) {
 	 */
 	public static function handle_privacy_bulk_actions( $redirect_url, $action, $subscription_ids ) {
 		if ( 'wcs_remove_personal_data' !== $action ) {
-			return;
+			return $redirect_url;
 		}
 
 		$changed       = 0;
@@ -146,8 +146,7 @@ public static function handle_privacy_bulk_actions( $redirect_url, $action, $sub
 		$sendback_args['changed'] = $changed;
 		$sendback                 = add_query_arg( $sendback_args, $redirect_url );
 
-		wp_safe_redirect( esc_url_raw( $sendback ) );
-		exit();
+		return esc_url_raw( $sendback );
 	}
 
 	/**
@@ -178,7 +177,10 @@ public static function process_bulk_action() {
 		$subscription_ids  = array_map( 'absint', (array) $_REQUEST['post'] );
 		$base_redirect_url = wp_get_referer() ? wp_get_referer() : '';
 
-		self::handle_privacy_bulk_actions( $base_redirect_url, $action, $subscription_ids );
+		$redirect_url = self::handle_privacy_bulk_actions( $base_redirect_url, $action, $subscription_ids );
+
+		wp_safe_redirect( $redirect_url );
+		exit();
 	}
 
 	/**