Refactoring with Copilot

Author: alefesouza

includes/admin/class-wcs-admin-post-types.php

@@ -688,18 +688,7 @@ public static function get_date_column_content( $subscription, $column ) {
 		$date_type     = array_key_exists( $column, $date_type_map ) ? $date_type_map[ $column ] : $column;
 
 		if ( 'last_payment_date' === $column ) {
-			// Get last order date created from subscription metadata if it exists.
-			$last_order_date_created = $subscription->get_last_order_date_created();
-
-			if ( ! empty( $last_order_date_created ) ) {
-				$date_timestamp = $last_order_date_created;
-			} else {
-				// If not exists, get the last order date created from the orders and update the metadata.
-				$date_timestamp = $subscription->get_time( $date_type );
-
-				$subscription->set_last_order_date_created( $date_timestamp );
-				$subscription->save();
-			}
+			$date_timestamp = self::get_last_payment_date( $subscription );
 		} else {
 			$date_timestamp = $subscription->get_time( $date_type );
 		}
@@ -1850,6 +1839,26 @@ public function orders_table_query_clauses( $pieces, $query, $args ) {
 		return $pieces;
 	}
 
+	/**
+	 * Get the last payment date for a subscription.
+	 *
+	 * @param WC_Subscription $subscription The subscription object.
+	 * @return int The last payment date timestamp.
+	 */
+	private static function get_last_payment_date( $subscription ) {
+		$last_order_date_created = $subscription->get_last_order_date_created();
+
+		if ( ! empty( $last_order_date_created ) ) {
+			return $last_order_date_created;
+		}
+
+		$date_timestamp = $subscription->get_time( 'last_order_date_created' );
+		$subscription->set_last_order_date_created( $date_timestamp );
+		$subscription->save();
+
+		return $date_timestamp;
+	}
+
 	/**
 	 * Adds order table query clauses to sort the subscriptions list table by last payment date.
 	 *

includes/class-wc-subscriptions-order.php

@@ -2440,23 +2440,26 @@ public static function delete_order_update_subscription_last_order_date_created(
 	 * @param mixed $prev_value The previous value stored in the database. Optional.
 	 */
 	public static function update_subscription_last_order_date_parent_id_changes( $type, $object_id, $key, $new_value, $previous_value ) {
-		if ( 'parent_id' === $key && ! empty( $previous_value ) && ! empty( $new_value ) ) {
-			$previous_subscription = wcs_get_subscription( $previous_value );
-			$new_subscription      = wcs_get_subscription( $new_value );
+		if ( 'parent_id' !== $key || empty( $previous_value ) || empty( $new_value ) ) {
+			return;
+		}
 
-			if ( ! $previous_subscription || ! $new_subscription ) {
-				return;
-			}
+		$previous_subscription = wcs_get_subscription( $previous_value );
+		$new_subscription      = wcs_get_subscription( $new_value );
 
-			$previous_last_order_date_created = $previous_subscription->get_time( 'last_order_date_created' );
-			$new_last_order_date_created      = $new_subscription->get_time( 'last_order_date_created' );
+		if ( ! $previous_subscription || ! $new_subscription ) {
+			return;
+		}
 
-			$new_subscription->set_last_order_date_created( $previous_last_order_date_created );
-			$new_subscription->save();
+		// Switch last order date on both subscriptions.
+		$previous_last_order_date_created = $previous_subscription->get_time( 'last_order_date_created' );
+		$new_last_order_date_created      = $new_subscription->get_time( 'last_order_date_created' );
 
-			$previous_subscription->set_last_order_date_created( $new_last_order_date_created );
-			$previous_subscription->save();
-		}
+		$new_subscription->set_last_order_date_created( $previous_last_order_date_created );
+		$new_subscription->save();
+
+		$previous_subscription->set_last_order_date_created( $new_last_order_date_created );
+		$previous_subscription->save();
 	}
 
 	/**

includes/wcs-order-functions.php

@@ -277,6 +277,8 @@ function wcs_create_order_from_subscription( $subscription, $type ) {
 			throw new Exception( sprintf( __( 'There was an error fetching the new order (%1$s) for subscription %2$d.', 'woocommerce-subscriptions' ), $type, $subscription->get_id() ) );
 		}
 
+		// Update the subscription last_order_date_created on every time
+		// a child order is created.
 		$subscription->set_last_order_date_created( $new_order->get_date_created()->getTimestamp() );
 		$subscription->save();