fix(email-change): ensure success and error messages persist after redirect (#3913)

Author: dkoo

includes/class-donations.php

@@ -1115,6 +1115,9 @@ public static function update_billing_fields( $billing_fields ) {
 	 * @return bool
 	 */
 	public static function disable_coupons( $enabled ) {
+		if ( ! did_action( 'woocommerce_after_register_post_type' ) ) {
+			return $enabled;
+		}
 		if ( is_admin() ) {
 			return $enabled;
 		}

includes/reader-revenue/my-account/class-woocommerce-my-account.php

@@ -936,7 +936,8 @@ public static function handle_verify_email_change() {
 		if ( ! $secret ) {
 			return;
 		}
-		$error     = __( 'Something went wrong.', 'newspack-plugin' );
+		$message   = __( 'Your email address has been successfully updated.', 'newspack-plugin' );
+		$is_error  = false;
 		$user_id   = \get_current_user_id();
 		$new_email = \get_user_meta( $user_id, self::PENDING_EMAIL_CHANGE_META, true );
 		$old_email = \wp_get_current_user()->user_email;
@@ -955,14 +956,27 @@ public static function handle_verify_email_change() {
 				self::maybe_sync_email_change_with_stripe( $user_id, $new_email );
 				self::sync_email_change_with_esp( $user_id, $new_email, $old_email );
 				\delete_user_meta( $user_id, self::PENDING_EMAIL_CHANGE_META );
-				\wc_add_notice( __( 'Your email address has been successfully updated.', 'newspack-plugin' ) );
 			} else {
-				\wc_add_notice( $error, 'error' );
+				$message  = __( 'Something went wrong.', 'newspack-plugin' );
+				$is_error = true;
 			}
 		} else {
-			\wc_add_notice( __( 'This email change request has been cancelled or expired.', 'newspack-plugin' ), 'error' );
+			$message  = __( 'This email change request has been cancelled or expired.', 'newspack-plugin' );
+			$is_error = true;
 		}
-		\wp_safe_redirect( \wc_get_endpoint_url( 'edit-account', '', \wc_get_page_permalink( 'myaccount' ) ) );
+		\wp_safe_redirect(
+			\add_query_arg(
+				[
+					'message'  => $message,
+					'is_error' => $is_error,
+				],
+				\wc_get_endpoint_url(
+					'edit-account',
+					'',
+					\wc_get_page_permalink( 'myaccount' )
+				)
+			)
+		);
 		exit;
 	}
 
@@ -978,13 +992,27 @@ public static function handle_cancel_email_change() {
 			return;
 		}
 		$current_email = \wp_get_current_user()->user_email;
+		$message       = __( 'Your email address change request has been cancelled.', 'newspack-plugin' );
+		$is_error      = false;
 		if ( \wp_hash( $current_email ) === $secret ) {
 			\delete_user_meta( \get_current_user_id(), self::PENDING_EMAIL_CHANGE_META );
-			\wc_add_notice( __( 'Your email change request has been cancelled.', 'newspack-plugin' ) );
 		} else {
-			\wc_add_notice( __( 'This email change request has been cancelled or expired.', 'newspack-plugin' ), 'error' );
+			$message  = __( 'This email change request has been cancelled or expired.', 'newspack-plugin' );
+			$is_error = true;
 		}
-		\wp_safe_redirect( \wc_get_endpoint_url( 'edit-account', '', \wc_get_page_permalink( 'myaccount' ) ) );
+		\wp_safe_redirect(
+			\add_query_arg(
+				[
+					'message'  => $message,
+					'is_error' => $is_error,
+				],
+				\wc_get_endpoint_url(
+					'edit-account',
+					'',
+					\wc_get_page_permalink( 'myaccount' )
+				)
+			)
+		);
 		exit;
 	}