diff --git a/stripe/controllers/FrmTransLiteAppController.php b/stripe/controllers/FrmTransLiteAppController.php index 59a31b1232..b8f0e495b2 100755 --- a/stripe/controllers/FrmTransLiteAppController.php +++ b/stripe/controllers/FrmTransLiteAppController.php @@ -62,7 +62,12 @@ public static function run_payment_cron() { $frm_sub = new FrmTransLiteSubscription(); $frm_payment = new FrmTransLitePayment(); $overdue_subscriptions = $frm_sub->get_overdue_subscriptions(); - FrmTransLiteLog::log_message( 'Stripe Cron Message', count( $overdue_subscriptions ) . ' subscriptions found to be processed.', false ); + + if ( ! $overdue_subscriptions && ! $frm_sub->get_active_subscriptions() ) { + return; + } + + FrmTransLiteLog::log_message( 'Overdue Subscription Cron Message', count( $overdue_subscriptions ) . ' subscriptions found to be processed.', false ); foreach ( $overdue_subscriptions as $sub ) { $last_payment = $frm_payment->get_one_by( $sub->id, 'sub_id' ); @@ -112,7 +117,7 @@ public static function run_payment_cron() { } }//end if - FrmTransLiteLog::log_message( 'Stripe Cron Message', $log_message ); + FrmTransLiteLog::log_message( 'Overdue Subscription Cron Message', $log_message ); self::maybe_trigger_changes( array( diff --git a/stripe/models/FrmTransLiteSubscription.php b/stripe/models/FrmTransLiteSubscription.php index 375ad3ad62..b1b90bb8a7 100755 --- a/stripe/models/FrmTransLiteSubscription.php +++ b/stripe/models/FrmTransLiteSubscription.php @@ -92,4 +92,21 @@ public function get_overdue_subscriptions() { ) ); } + + /** + * Get all active or future_cancel subscriptions without next_bill_date check. + * + * @since x.x + * + * @return array + */ + public function get_active_subscriptions() { + global $wpdb; + return $wpdb->get_results( + $wpdb->prepare( + "SELECT * FROM %i WHERE (status = 'active' OR status = 'future_cancel')", + $wpdb->prefix . 'frm_subscriptions' + ) + ); + } }