fix: check for billing period + interval, and account for in-progress

Automattic · Oct 23, 2024 · 6e5c96f · 6e5c96f
1 parent 90c075b
commit 6e5c96f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/includes/reader-revenue/woocommerce/class-woocommerce-cli.php b/includes/reader-revenue/woocommerce/class-woocommerce-cli.php
@@ -221,7 +221,7 @@ public function fix_missing_next_payment_dates( $args, $assoc_args ) {
 					continue;
 				}
 
-				$result   = [
+				$result = [
 					'ID'                => $subscription->get_id(),
 					'status'            => $subscription->get_status(),
 					'start_date'        => $subscription_start,
@@ -230,10 +230,14 @@ public function fix_missing_next_payment_dates( $args, $assoc_args ) {
 					'missed_periods'    => 0,
 					'missed_total'      => 0,
 				];
-				$min_date = strtotime( $subscription_start );
-				while ( $min_date <= $now ) {
-					$result['missed_periods']++;
-					$min_date = strtotime( '+1 ' . $result['billing_period'], $min_date );
+				if ( ! empty( $result['billing_period'] ) && ! empty( $result['billing_interval'] ) ) {
+					$period   = $result['billing_period'];
+					$interval = (int) $result['billing_interval'];
+					$min_date = strtotime( "+$interval $period", strtotime( $subscription_start ) ); // Start after first period so we don't count in-progress periods as missed.
+					while ( $min_date <= $now ) {
+						$result['missed_periods']++;
+						$min_date = strtotime( "+$interval $period", $min_date );
+					}
 				}
 
 				if ( $result['missed_periods'] ) {