UR-4670 Fix - Added spinner on Membership Reactivation. (#1349)

* Added spinner on reactivation.

* Cancel after reaching expiration.

Author: y000yal

assets/js/modules/membership/frontend/user-registration-membership-frontend.js

@@ -3793,7 +3793,8 @@
 							subscription_id: $this.data("id")
 						},
 						beforeSend: function () {
-							$this.text(urmf_data.labels.i18n_sending_text);
+							ur_membership_frontend_utils.append_spinner($this);
+							ur_membership_frontend_utils.toggleSaveButtons(true, $this);
 						},
 						success: function (response) {
 							if (!response.success) {
@@ -3821,7 +3822,8 @@
 							}
 						},
 						complete: function () {
-							$this.text(button_text);
+							ur_membership_frontend_utils.remove_spinner($this);
+							ur_membership_frontend_utils.toggleSaveButtons(false, $this);
 						}
 					});
 				}

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

@@ -185,6 +185,7 @@ public function get_about_to_expire_subscriptions( $check_date ) {
 						       wu.ID as member_id,
 						       wp.post_title as membership_plan_name,
 						       wums.item_id as membership,
+						       wums.ID as subscription_id,
 						       wums.next_billing_date,
 						       wums.expiry_date
 						FROM  $this->table wums
@@ -216,13 +217,14 @@ public function get_expired_subscriptions( $check_date ) {
 						       wu.ID as member_id,
 						       wp.post_title as membership_plan_name,
 						       wums.item_id as membership,
+						       wums.ID as subscription_id,
 						       wums.next_billing_date,
 						       wums.expiry_date
 						FROM  $this->table wums
 					    LEFT JOIN $this->users_table wu ON wums.user_id = wu.ID
 					    LEFT JOIN $this->posts_table wp ON wums.item_id = wp.ID
 						WHERE wums.status = 'expired'
-						AND DATE(wums.expiry_date) = DATE('%s')
+						AND wums.expiry_date >= '%s'
 						",
 			$check_date
 		);

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

@@ -1194,7 +1194,13 @@ public function daily_membership_expiring_soon_check() {
 		$email_service = new EmailService();
 		foreach ( $subscriptions as $subscription ) {
 
-			$user_id      = $subscription['member_id'];
+			$user_id = $subscription['member_id'];
+
+			// Skip memberships already scheduled to cancel; no "expiring soon / renew" reminder for them.
+			if ( get_user_meta( $user_id, 'urm_pending_cancel_' . ( $subscription['subscription_id'] ?? '' ), true ) ) {
+				continue;
+			}
+
 			$checked_date = get_user_meta( $user_id, 'urm_expiring_reminder_sent_for_date', true );
 
 			if ( $checked_date === $subscription['next_billing_date'] ) {
@@ -1211,22 +1217,23 @@ public function daily_membership_expiring_soon_check() {
 	 * @return void
 	 */
 	public function daily_membership_ended_check() {
-		$date          = new \DateTime( 'today' );
-		$check_date    = $date->modify( '-1 day' )->format( 'Y-m-d H:i:s' );
+		// Look back a window (not a single day) and dedupe per subscription, so a late status flip,
+		// cron-order drift, or a missed cron day can't permanently skip the ended email.
+		$lookback_days = (int) apply_filters( 'urm_ended_email_lookback_days', 7 );
+		$check_date    = ( new \DateTime( "-{$lookback_days} days" ) )->format( 'Y-m-d H:i:s' );
 		$subscriptions = $this->members_subscription_repository->get_expired_subscriptions( $check_date );
 
 		if ( empty( $subscriptions ) ) {
 			return;
 		}
 		$email_service = new EmailService();
 		foreach ( $subscriptions as $subscription ) {
-			$user_id      = $subscription['member_id'];
-			$checked_date = get_user_meta( $user_id, 'urm_expired_reminder_sent_for_date', true );
-			if ( $checked_date === $subscription['expiry_date'] ) {
+			$sent_key = 'urm_ended_email_sent_' . ( $subscription['subscription_id'] ?? '' );
+			if ( get_user_meta( $subscription['member_id'], $sent_key, true ) ) {
 				continue;
 			}
 			$email_service->send_email( $subscription, 'membership_ended' );
-			update_user_meta( $subscription['member_id'], 'urm_expired_reminder_sent_for_date', $subscription['expiry_date'] );
+			update_user_meta( $subscription['member_id'], $sent_key, $subscription['expiry_date'] );
 		}
 	}
 
@@ -1271,7 +1278,9 @@ public function daily_membership_expiration_check() {
 				( new NewPaypalService() )->cancel_suspended_subscription( $subscription['gateway_subscription_id'] );
 			}
 			delete_user_meta( $user_id, 'urm_pending_cancel_' . $subscription_id );
-			$update_result = $this->members_subscription_repository->update( $subscription_id, array( 'status' => 'expired' ) );
+			// A pending-cancel subscription reaching its date is a cancellation, not a natural expiry.
+			$new_status    = $pending_cancel_meta ? 'canceled' : 'expired';
+			$update_result = $this->members_subscription_repository->update( $subscription_id, array( 'status' => $new_status ) );
 
 			if ( $update_result ) {
 				++$expired_count;
@@ -1293,13 +1302,14 @@ public function daily_membership_expiration_check() {
 					array( 'source' => 'urm-membership-expiration' )
 				);
 
-				// Prepare data to trigger subscription expired event.
+				// Cancellation email already went out at cancel time; the membership_ended cron only targets 'expired', so a canceled sub gets no expiry email either.
 				$payload = array(
 					'subscription_id' => $subscription_id,
 					'member_id'       => $user_id,
-					'event_type'      => 'expired',
+					'event_type'      => $pending_cancel_meta ? 'canceled' : 'expired',
 					'meta'            => array(
 						'membership_id' => $membership_id,
+						'mode'          => 'expiry',
 					),
 				);