Cancel previous subscription. (#1343)

Author: y000yal

modules/membership/includes/AJAX.php

@@ -926,8 +926,9 @@ public static function confirm_payment() {
 				$is_delayed            = ! empty( $next_subscription['delayed_until'] );
 				if ( ! empty( $previous_subscription ) && ! $is_delayed ) {
 					$previous_subscription = json_decode( $previous_subscription, true );
-					$stripe_service        = new StripeService();
-					$stripe_service->cancel_subscription( array(), $previous_subscription );
+					$previous_order        = json_decode( get_user_meta( $member_id, 'urm_previous_order_data', true ), true );
+					$subscription_service  = new SubscriptionService();
+					$subscription_service->cancel_subscription( is_array( $previous_order ) ? $previous_order : array(), $previous_subscription, true );
 					delete_user_meta( $member_id, 'urm_next_subscription_data' );
 					delete_user_meta( $member_id, 'urm_previous_subscription_data' );
 					delete_user_meta( $member_id, 'urm_previous_order_data' );

modules/membership/includes/Admin/Services/Paypal/NewPaypalService.php

@@ -1626,7 +1626,7 @@ public function handle_upgrade_for_paypal( $member_id, $subscription_id ) {
 
 		if ( ! empty( $new_subscription_data ) ) {
 			if ( empty( $new_subscription_data['delayed_until'] ) && ! empty( $get_user_old_subscription['subscription_id'] ) ) {
-				$cancel_subscription = $this->cancel_subscription( $get_user_old_order, $get_user_old_subscription );
+				$cancel_subscription = $subscription_service->cancel_subscription( $get_user_old_order, $get_user_old_subscription, true );
 
 				if ( empty( $cancel_subscription['status'] ) ) {
 					PaymentGatewayLogging::log_error(
@@ -2413,7 +2413,7 @@ public function validate_setup( $membership_type ) {
 	 *
 	 * @return array
 	 */
-	public function cancel_subscription( $order, $subscription ) {
+	public function cancel_subscription( $order, $subscription, $force_cancel = false ) {
 		if ( empty( $subscription['subscription_id'] ) ) {
 			$message = esc_html__( 'PayPal subscription ID not present.', 'user-registration' );
 			return array(
@@ -2424,13 +2424,23 @@ public function cancel_subscription( $order, $subscription ) {
 
 		$paypal_options = $this->get_paypal_rest_credentials();
 
-		$response = $this->suspend_paypal_subscription(
-			$subscription['subscription_id'],
-			array(
-				'reason' => 'User initiated cancellation',
-			),
-			$paypal_options
-		);
+		if ( $force_cancel ) {
+			$response = $this->cancel_paypal_subscription(
+				$subscription['subscription_id'],
+				array(
+					'reason' => 'Membership upgrade',
+				),
+				$paypal_options
+			);
+		} else {
+			$response = $this->suspend_paypal_subscription(
+				$subscription['subscription_id'],
+				array(
+					'reason' => 'User initiated cancellation',
+				),
+				$paypal_options
+			);
+		}
 
 		if ( is_wp_error( $response ) ) {
 			PaymentGatewayLogging::log_transaction_failure(

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

@@ -205,12 +205,12 @@ public static function get_expiry_date( $start_date, $period, $value ) {
 	 *
 	 * @return array|bool[]|void
 	 */
-	public function cancel_subscription( $order, $subscription ) {
+	public function cancel_subscription( $order, $subscription, $force_cancel = false ) {
 		switch ( $order['payment_method'] ) {
 			case 'paypal':
 				$paypal_service = new NewPaypalService();
 
-				return $paypal_service->cancel_subscription( $order, $subscription );
+				return $paypal_service->cancel_subscription( $order, $subscription, $force_cancel );
 
 			case 'stripe':
 				$stripe_service = new StripeService();