Merge branch 'trunk' into fix/synced-prepaid-sub

Author: Mayisha

changelog.txt

@@ -1,6 +1,7 @@
 *** WooCommerce Subscriptions Core Changelog ***
 
-= 7.4.0 - 2024-xx-xx =
+= 7.4.0 - 2024-08-16 =
+* Dev - Introduce new parameter to WC_Subscription::get_last_order() to enable filtering out orders with specific statuses.
 * 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.
 * Fix - Add a year to the next renewal date billing interval is 12 months or more for a synced subscription.
@@ -9,6 +10,7 @@
 * 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.
 * Fix - Prevent errors from invalid subscription objects during customer payment method updates.
+* Fix - Resolved an error when purchasing subscription products on the block checkout with a limited recurring coupon.
 
 = 7.2.0 - 2024-06-13 =
 * Fix - label improvement on my subscription page template.

includes/class-wc-subscription.php

@@ -2077,9 +2077,10 @@ protected function get_related_order_ids( $order_type = 'any' ) {
 	 *
 	 * @param string $return_fields The columns to return, either 'all' or 'ids'
 	 * @param array $order_types Can include any combination of 'parent', 'renewal', 'switch' or 'any' which will return the latest renewal order of any type. Defaults to 'parent' and 'renewal'.
+	 * @param array $exclude_statuses An array of statuses to exclude from the search. Defaults to an empty array.
 	 * @since 1.0.0 - Migrated from WooCommerce Subscriptions v2.0
 	 */
-	public function get_last_order( $return_fields = 'ids', $order_types = array( 'parent', 'renewal' ) ) {
+	public function get_last_order( $return_fields = 'ids', $order_types = array( 'parent', 'renewal' ), $exclude_statuses = [] ) {
 
 		$return_fields  = ( 'ids' == $return_fields ) ? $return_fields : 'all';
 		$order_types    = ( 'any' == $order_types ) ? array( 'parent', 'renewal', 'switch' ) : (array) $order_types;
@@ -2098,6 +2099,16 @@ public function get_last_order( $return_fields = 'ids', $order_types = array( 'p
 			}
 		}
 
+		if ( ! empty( $exclude_statuses ) ) {
+			$related_orders = array_filter(
+				$related_orders,
+				function( $order_id ) use ( $exclude_statuses ) {
+					$order = wc_get_order( $order_id );
+					return $order && ! $order->has_status( $exclude_statuses );
+				}
+			);
+		}
+
 		if ( empty( $related_orders ) ) {
 			$last_order = false;
 		} else {

includes/class-wc-subscriptions-core-plugin.php

@@ -16,7 +16,7 @@ class WC_Subscriptions_Core_Plugin {
 	 * The version of subscriptions-core library.
 	 * @var string
 	 */
-	protected $library_version = '7.3.0'; // WRCS: DEFINED_VERSION.
+	protected $library_version = '7.4.0'; // WRCS: DEFINED_VERSION.
 
 	/**
 	 * The subscription scheduler instance.

includes/class-wc-subscriptions-order.php

@@ -683,29 +683,54 @@ public static function order_needs_payment( $needs_payment, $order, $valid_order
 		}
 
 		// Skip checks if order total is greater than zero, or
-		// recurring total is zero, or
 		// order status isn't valid for payment.
-		if ( $order->get_total() > 0 || self::get_recurring_total( $order ) <= 0 || ! $order->has_status( $valid_order_statuses ) ) {
+		if ( $order->get_total() > 0 || ! $order->has_status( $valid_order_statuses ) ) {
 			return $needs_payment;
 		}
 
-		// Check that there is at least 1 subscription with a next payment that would require a payment method.
-		$has_next_payment = false;
+		// Skip checks if manual renewal is required.
+		if ( wcs_is_manual_renewal_required() ) {
+			return $needs_payment;
+		}
 
+		// Check if there's a subscription attached to this order that will require a payment method.
 		foreach ( wcs_get_subscriptions_for_order( $order ) as $subscription ) {
+			$has_next_payment                 = false;
+			$contains_expiring_limited_coupon = false;
+			$contains_free_trial              = false;
+			$contains_synced                  = false;
+
+			// Check if there's a subscription with a recurring total that would require a payment method.
+			$recurring_total = (float) $subscription->get_total();
+
+			// Check that there is at least 1 subscription with a next payment that would require a payment method.
 			if ( $subscription->get_time( 'next_payment' ) ) {
 				$has_next_payment = true;
-				break;
 			}
-		}
 
-		if ( ! $has_next_payment ) {
-			return $needs_payment;
-		}
+			// Check if there's a subscription with a limited recurring coupon that is expiring that would require a payment method after the coupon expires.
+			if ( class_exists( 'WCS_Limited_Recurring_Coupon_Manager' ) && WCS_Limited_Recurring_Coupon_Manager::order_has_limited_recurring_coupon( $subscription ) ) {
+				$contains_expiring_limited_coupon = true;
+			}
+
+			// Check if there's a subscription with a free trial that would require a payment method after the trial ends.
+			if ( $subscription->get_time( 'trial_end' ) ) {
+				$contains_free_trial = true;
+			}
 
-		// If manual renewals are not required.
-		if ( ! wcs_is_manual_renewal_required() ) {
-			$needs_payment = true;
+			// Check if there's a subscription with a synced product that would require a payment method.
+			if ( WC_Subscriptions_Synchroniser::subscription_contains_synced_product( $subscription ) ) {
+				$contains_synced = true;
+			}
+
+			/**
+			 * We need to collect a payment method if there's a subscription with a recurring total or a limited recurring coupon that is expiring and
+			 * there's a next payment date or a free trial or a synced product.
+			 */
+			if ( ( $contains_expiring_limited_coupon || $recurring_total > 0 ) && ( $has_next_payment || $contains_free_trial || $contains_synced ) ) {
+				$needs_payment = true;
+				break; // We've found a subscription that requires a payment method.
+			}
 		}
 
 		return $needs_payment;

package-lock.json

@@ -3,7 +3,7 @@
 	"title": "WooCommerce Subscriptions Core",
 	"author": "Automattic",
 	"license": "GPL-3.0-or-later",
-	"version": "7.3.0",
+	"version": "7.4.0",
 	"description": "",
 	"homepage": "https://github.com/Automattic/woocommerce-subscriptions-core",
 	"main": "Gruntfile.js",

package.json

@@ -2060,6 +2060,11 @@ public function test_get_last_order() {
 		$this->assertEquals( $order_id, $subscription->get_last_order() );
 		$this->assertEquals( wc_get_order( $order_id ), $subscription->get_last_order( 'all' ) );
 
+		// Test for the status filtering parameter
+		$order->update_status( 'failed' );
+		$order->save();
+		$this->assertFalse( $subscription->get_last_order( 'ids', array( 'parent', 'renewal' ), array( 'failed' ) ) );
+
 		$renewal    = WCS_Helper_Subscription::create_renewal_order( $subscription );
 		$renewal_id = wcs_get_objects_property( $renewal, 'id' );
 		$this->assertEquals( $renewal_id, $subscription->get_last_order( 'ids' ) );

tests/unit/test-class-wc-subscriptions.php

@@ -6,5 +6,5 @@
  * Author: Automattic
  * Author URI: https://woocommerce.com/
  * Requires WP: 5.6
- * Version: 7.3.0
+ * Version: 7.4.0
  */