Remove payment cron when all gateways are disconnected

classes/controllers/FrmAppController.php

@@ -1330,14 +1330,18 @@ public static function handle_activation() {
 
 	/**
 	 * The payment cron is unscheduled when Formidable is deactivated.
-	 * We need to add it back again on activation if Stripe is configured.
+	 * We need to add it back again on activation if any payment gateway is configured.
 	 *
 	 * @since 6.5
 	 *
 	 * @return void
 	 */
 	private static function maybe_activate_payment_cron() {
-		if ( ! FrmStrpLiteConnectHelper::stripe_connect_is_setup() ) {
+		$stripe_connected = FrmStrpLiteConnectHelper::at_least_one_mode_is_setup();
+		$square_connected = FrmSquareLiteConnectHelper::at_least_one_mode_is_setup();
+		$paypal_connected = FrmPayPalLiteConnectHelper::at_least_one_mode_is_setup();
+
+		if ( ! $stripe_connected && ! $square_connected && ! $paypal_connected ) {
 			return;
 		}
 

paypal/helpers/FrmPayPalLiteConnectHelper.php

@@ -938,6 +938,7 @@ public static function process_event( $event_id ) {
 	public static function handle_disconnect() {
 		self::disconnect();
 		self::reset_paypal_api_integration();
+		FrmTransLiteAppHelper::trigger_gateway_disconnected_hook( 'paypal', self::get_mode_value_from_post() );
 		wp_send_json_success();
 	}
 

square/helpers/FrmSquareLiteConnectHelper.php

@@ -707,6 +707,7 @@ public static function cancel_subscription( $subscription_id ) {
 	public static function handle_disconnect() {
 		self::disconnect();
 		self::reset_square_api_integration();
+		FrmTransLiteAppHelper::trigger_gateway_disconnected_hook( 'square', self::get_mode_value_from_post() );
 		wp_send_json_success();
 	}
 

stripe/controllers/FrmTransLiteAppController.php

@@ -45,12 +45,23 @@ public static function maybe_schedule_cron() {
 	}
 
 	/**
-	 * Remove the cron when the plugin is deactivated.
+	 * Remove the payment cron when all gateways are disconnected.
+	 *
+	 * @since x.x
+	 *
+	 * @param string $gateway 'stripe', 'square', or 'paypal'.
+	 * @param string $mode 'test' or 'live'.
 	 *
 	 * @return void
 	 */
-	public static function remove_cron() {
-		wp_clear_scheduled_hook( 'frm_payment_cron' );
+	public static function maybe_remove_payment_cron( $gateway, $mode ) {
+		$stripe_connected = FrmStrpLiteConnectHelper::at_least_one_mode_is_setup();
+		$square_connected = FrmSquareLiteConnectHelper::at_least_one_mode_is_setup();
+		$paypal_connected = FrmPayPalLiteConnectHelper::at_least_one_mode_is_setup();
+
+		if ( ! $stripe_connected && ! $square_connected && ! $paypal_connected ) {
+			wp_clear_scheduled_hook( 'frm_payment_cron' );
+		}
 	}
 
 	/**
@@ -231,4 +242,16 @@ public static function hide_gateway_fields_in_builder() {
 			'
 		);
 	}
+
+	/**
+	 * Remove the cron when the plugin is deactivated.
+	 *
+	 * @deprecated x.x
+	 *
+	 * @return void
+	 */
+	public static function remove_cron() {
+		_deprecated_function( __METHOD__, 'x.x' );
+		wp_clear_scheduled_hook( 'frm_payment_cron' );
+	}
 }

stripe/controllers/FrmTransLiteHooksController.php

@@ -36,6 +36,8 @@ public static function load_hooks() {
 	 * @return void
 	 */
 	public static function load_admin_hooks() {
+		add_action( 'frm_disconnected_gateway', 'FrmTransLiteAppController::maybe_remove_payment_cron' );
+
 		if ( class_exists( 'FrmTransHooksController', false ) ) {
 			add_action( 'frm_pay_show_square_options', 'FrmTransLiteAppController::add_repeat_cadence_value' );
 

stripe/helpers/FrmStrpLiteConnectHelper.php

@@ -263,7 +263,7 @@ private static function get_url_to_connect_server() {
 	private static function handle_disconnect() {
 		self::disconnect();
 		self::reset_stripe_connect_integration();
-		self::maybe_unschedule_crons();
+		FrmTransLiteAppHelper::trigger_gateway_disconnected_hook( 'stripe', self::get_mode_value_from_post() );
 		wp_send_json_success();
 	}
 
@@ -290,27 +290,6 @@ private static function disconnect() {
 		return self::post_with_authenticated_body( 'disconnect', $additional_body );
 	}
 
-	/**
-	 * Stop the payment cron once all Stripe connections have been disconnected.
-	 *
-	 * @since 6.5
-	 *
-	 * @return void
-	 */
-	private static function maybe_unschedule_crons() {
-		if ( self::at_least_one_mode_is_setup() ) {
-			// Don't unschedule if a mode is still on.
-			return;
-		}
-
-		$event     = 'frm_payment_cron';
-		$timestamp = wp_next_scheduled( $event );
-
-		if ( false !== $timestamp ) {
-			wp_unschedule_event( $timestamp, $event );
-		}
-	}
-
 	/**
 	 * @since 6.5
 	 *

stripe/helpers/FrmTransLiteAppHelper.php

@@ -641,4 +641,22 @@ private static function sort_gateways( $gateways, $order ) {
 
 		return $sorted + $gateways;
 	}
+
+	/**
+	 * @since x.x
+	 *
+	 * @param string $gateway 'stripe', 'square', or 'paypal'.
+	 * @param string $mode 'test' or 'live'.
+	 *
+	 * @return void
+	 */
+	public static function trigger_gateway_disconnected_hook( $gateway, $mode ) {
+		/**
+		 * @since x.x
+		 *
+		 * @param string $gateway 'stripe', 'square', or 'paypal'.
+		 * @param string $mode 'test' or 'live'.
+		 */
+		do_action( 'frm_disconnected_gateway', $gateway, $mode );
+	}
 }