Ur 4686 - Fix - Double Charge on Upgrade. (#1339)

* Fixed upgrade logic .

* Moved sql to repositories.

Author: y000yal

modules/membership/includes/Admin/Interfaces/BaseInterface.php

@@ -56,4 +56,8 @@ public function delete( $id );
 	 * @return void
 	 */
 	public function delete_multiple( $ids );
+
+	public function acquire_lock( $name, $timeout = 5 );
+
+	public function release_lock( $name );
 }

modules/membership/includes/Admin/Repositories/BaseRepository.php

@@ -96,4 +96,15 @@ public function delete_multiple( $ids ) {
 	public function delete( $id ) {
 		return $this->wpdb()->delete( $this->table, array( 'ID' => $id ) );
 	}
+
+	// Returns true if acquired, false on contention/timeout, null if the DB has no GET_LOCK support.
+	public function acquire_lock( $name, $timeout = 5 ) {
+		$result = $this->wpdb()->get_var( $this->wpdb()->prepare( 'SELECT GET_LOCK(%s, %d)', $name, $timeout ) );
+
+		return null === $result ? null : ( '1' === (string) $result );
+	}
+
+	public function release_lock( $name ) {
+		return $this->wpdb()->get_var( $this->wpdb()->prepare( 'SELECT RELEASE_LOCK(%s)', $name ) );
+	}
 }

modules/membership/includes/Admin/Services/Stripe/StripeService.php

@@ -2585,6 +2585,10 @@ public function revert_subscription( int $member_id ): void {
 		$last_order   = $this->members_orders_repository->get_member_orders( $member_id );
 		$subscription = $this->members_subscription_repository->retrieve( $subscription_id );
 
+		if ( 'stripe' === ( $last_order['payment_method'] ?? '' ) && $this->stripe_charge_succeeded( $last_order, $subscription ) ) {
+			return;
+		}
+
 		$this->members_subscription_repository->update( $subscription_id, $last_subscription );
 		$this->members_orders_repository->delete_member_order( $member_id, false );
 		$refund_response = $this->refund( $last_order, $subscription ); // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
@@ -2598,6 +2602,22 @@ public function revert_subscription( int $member_id ): void {
 		}
 	}
 
+	private function stripe_charge_succeeded( $order, $subscription ) {
+		try {
+			if ( 'subscription' === ( $order['order_type'] ?? '' ) && ! empty( $subscription['subscription_id'] ) ) {
+				$stripe_subscription = \Stripe\Subscription::retrieve( $subscription['subscription_id'] );
+				return in_array( $stripe_subscription->status, array( 'active', 'trialing' ), true );
+			}
+			if ( ! empty( $order['transaction_id'] ) ) {
+				$intent = \Stripe\PaymentIntent::retrieve( $order['transaction_id'] );
+				return 'succeeded' === $intent->status;
+			}
+		} catch ( \Stripe\Exception\ApiErrorException $e ) {
+			PaymentGatewayLogging::log_error( 'stripe', 'Failed to verify Stripe charge before revert: ' . $e->getMessage() );
+		}
+		return false;
+	}
+
 	/**
 	 * Refund an order.
 	 *

modules/membership/includes/Admin/Services/SubscriptionService.php

@@ -534,32 +534,47 @@ public function upgrade_membership( $data ) {
 		}
 
 		$selected_membership_details['payment_method'] = $payment_method;
-		$membership_process                            = urm_get_membership_process( $user->ID );
 
-		$is_upgrading = ! empty( $membership_process['upgrade'] ) && isset( $membership_process['upgrade'][ $data['current_membership_id'] ] );
+		$lock_name = 'urm_upgrade_lock_' . (int) $user->ID;
+		$lock      = $this->subscription_repository->acquire_lock( $lock_name );
 
-		if ( $is_upgrading ) {
+		$membership_process = urm_get_membership_process( $user->ID );
+		$in_progress        = $membership_process['upgrade'][ $data['current_membership_id'] ] ?? array();
+		// A stale guard means a previous attempt died or was abandoned before completing; let it be retried.
+		$is_upgrading = ! empty( $in_progress ) && ( time() - (int) ( $in_progress['started_at'] ?? 0 ) ) < 15 * MINUTE_IN_SECONDS;
+
+		if ( false === $lock || $is_upgrading ) {
+			if ( true === $lock ) {
+				$this->subscription_repository->release_lock( $lock_name );
+			}
 			$response['response']['status']  = false;
 			$response['response']['message'] = __( 'Membership upgrade process already initiated.', 'user-registration' );
 
 			return $response;
 		}
 
-		$membership_process = urm_get_membership_process( $subscription['user_id'] );
-		$is_upgrading       = ! empty( $membership_process['upgrade'] ) && isset( $membership_process['upgrade'][ $data['current_membership_id'] ] );
+		if ( 'free' !== $payment_method ) {
+			$membership_process['upgrade'][ $data['current_membership_id'] ] = array(
+				'from'            => $data['current_membership_id'],
+				'to'              => $data['selected_membership_id'],
+				'subscription_id' => $data['current_subscription_id'],
+				'started_at'      => time(),
+			);
 
-		if ( $is_upgrading ) {
-			$response['response']['status']  = false;
-			$response['response']['message'] = __( 'Membership upgrade process already initiated.', 'user-registration' );
+			update_user_meta( $user->ID, 'urm_membership_process', $membership_process );
+		}
 
-			return $response;
+		if ( true === $lock ) {
+			$this->subscription_repository->release_lock( $lock_name );
 		}
 
 		$current_membership_details['ID']  = $data['current_membership_id'];
 		$selected_membership_details['ID'] = $data['selected_membership_id'];
 		$upgrade_details                   = $this->calculate_membership_upgrade_cost( $current_membership_details, $selected_membership_details, $subscription );
 
 		if ( isset( $upgrade_details['status'] ) && ! $upgrade_details['status'] ) {
+			$this->release_upgrade_guard( $user->ID, $data['current_membership_id'] );
+
 			return array(
 				'response' => $upgrade_details,
 			);
@@ -622,6 +637,8 @@ public function upgrade_membership( $data ) {
 			if ( ! $cancel_subscription['status'] ) {
 				$response['status'] = false;
 
+				$this->release_upgrade_guard( $user->ID, $data['current_membership_id'] );
+
 				return $response;
 			} else {
 				$this->subscription_repository->cancel_subscription_by_id( $current_subscription_id, false );
@@ -639,19 +656,6 @@ public function upgrade_membership( $data ) {
 		$ur_authorize_net_data = isset( $data['ur_authorize_net'] ) ? $data['ur_authorize_net'] : array();
 		$coupon                = isset( $data['coupon'] ) ? $data['coupon'] : '';
 
-		if ( 'free' !== $payment_method ) {
-			$membership_process = urm_get_membership_process( $user->ID );
-			if ( ! isset( $membership_process['upgrade'][ $data['current_membership_id'] ] ) ) {
-				$membership_process['upgrade'][ $data['current_membership_id'] ] = array(
-					'from'            => $data['current_membership_id'],
-					'to'              => $data['selected_membership_id'],
-					'subscription_id' => $data['current_subscription_id'],
-				);
-
-				update_user_meta( $user->ID, 'urm_membership_process', $membership_process );
-			}
-		}
-
 		$data = array(
 			'membership'             => $data['selected_membership_id'],
 			'subscription_id'        => $subscription['ID'],
@@ -682,12 +686,7 @@ public function upgrade_membership( $data ) {
 			$response['status'] = true;
 
 		} else {
-			$membership_process = urm_get_membership_process( $user->ID );
-			if ( ! empty( $membership_process['upgrade'][ $data['current_membership_id'] ] ) ) {
-				unset( $membership_process['upgrade'][ $data['current_membership_id'] ] );
-				update_user_meta( $user->ID, 'urm_membership_process', $membership_process );
-			}
-
+			$this->release_upgrade_guard( $user->ID, $data['current_membership_id'] );
 			$this->orders_repository->delete( $order['ID'] );
 		}
 
@@ -703,6 +702,14 @@ public function upgrade_membership( $data ) {
 		);
 	}
 
+	private function release_upgrade_guard( $member_id, $current_membership_id ) {
+		$membership_process = urm_get_membership_process( $member_id );
+		if ( ! empty( $membership_process['upgrade'][ $current_membership_id ] ) ) {
+			unset( $membership_process['upgrade'][ $current_membership_id ] );
+			update_user_meta( $member_id, 'urm_membership_process', $membership_process );
+		}
+	}
+
 	/**
 	 * Calculate upgrade cost and details between memberships.
 	 *