From 1d61e495e04dee0234eb7e0ddd7ce66529cb7b7c Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Wed, 11 Feb 2026 13:45:59 +1100
Subject: [PATCH 01/13] Initial expiry banner feature commit

---
 .../plugins/memberful-wp/memberful-wp.php     |   1 +
 .../plugins/memberful-wp/src/admin.php        |   8 +-
 .../memberful-wp/src/expiry_banner.php        | 197 ++++++++++++++++++
 .../plugins/memberful-wp/src/options.php      |   2 +
 .../memberful-wp/views/expiry-banner.php      |  46 ++++
 .../plugins/memberful-wp/views/options.php    |  12 ++
 6 files changed, 265 insertions(+), 1 deletion(-)
 create mode 100644 wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
 create mode 100644 wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php

diff --git a/wordpress/wp-content/plugins/memberful-wp/memberful-wp.php b/wordpress/wp-content/plugins/memberful-wp/memberful-wp.php
index eeb0aadc..bf450384 100755
--- a/wordpress/wp-content/plugins/memberful-wp/memberful-wp.php
+++ b/wordpress/wp-content/plugins/memberful-wp/memberful-wp.php
@@ -50,6 +50,7 @@
 require_once MEMBERFUL_DIR . '/src/search_filter.php';
 require_once MEMBERFUL_DIR . '/src/entities.php';
 require_once MEMBERFUL_DIR . '/src/embed.php';
+require_once MEMBERFUL_DIR . '/src/expiry_banner.php';
 require_once MEMBERFUL_DIR . '/src/api.php';
 require_once MEMBERFUL_DIR . '/src/roles.php';
 require_once MEMBERFUL_DIR . '/src/syncing.php';
diff --git a/wordpress/wp-content/plugins/memberful-wp/src/admin.php b/wordpress/wp-content/plugins/memberful-wp/src/admin.php
index 724e2e7e..5f70aa4e 100755
--- a/wordpress/wp-content/plugins/memberful-wp/src/admin.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/admin.php
@@ -273,6 +273,8 @@ function memberful_wp_options() {
       update_option( 'memberful_filter_account_menu_items', isset( $_POST['memberful_filter_account_menu_items'] ));
       update_option( 'memberful_auto_sync_display_names', isset( $_POST['memberful_auto_sync_display_names'] ) );
       update_option( 'memberful_show_protected_content_in_search', isset( $_POST['memberful_show_protected_content_in_search'] ) );
+      update_option( 'memberful_expiry_banner_enabled', isset( $_POST['memberful_expiry_banner_enabled'] ) );
+      update_option( 'memberful_expiry_banner_days', min( 90, max( 1, (int) ( $_POST['memberful_expiry_banner_days'] ?? 7 ) ) ) );
 
       return wp_redirect( admin_url( 'options-general.php?page=memberful_options' ) );
     }
@@ -310,6 +312,8 @@ function memberful_wp_options() {
   $filter_account_menu_items = get_option( 'memberful_filter_account_menu_items' );
   $auto_sync_display_names = get_option( 'memberful_auto_sync_display_names' );
   $show_protected_content_in_search = get_option( 'memberful_show_protected_content_in_search' );
+  $expiry_banner_enabled = get_option( 'memberful_expiry_banner_enabled' );
+  $expiry_banner_days = get_option( 'memberful_expiry_banner_days', 7 );
 
   memberful_wp_render (
     'options',
@@ -322,7 +326,9 @@ function memberful_wp_options() {
       'block_dashboard_access' => $block_dashboard_access,
       'filter_account_menu_items' => $filter_account_menu_items,
       'auto_sync_display_names' => $auto_sync_display_names,
-      'show_protected_content_in_search' => $show_protected_content_in_search
+      'show_protected_content_in_search' => $show_protected_content_in_search,
+      'expiry_banner_enabled' => $expiry_banner_enabled,
+      'expiry_banner_days' => $expiry_banner_days
     )
   );
 }
diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
new file mode 100644
index 00000000..fe028dc2
--- /dev/null
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -0,0 +1,197 @@
+<?php
+
+add_action( 'wp_footer', 'memberful_wp_render_expiry_banner' );
+
+/**
+ * Renders the expiry banner on front end pages for eligible users.
+ *
+ * @return void
+ */
+function memberful_wp_render_expiry_banner() {
+  if ( is_admin() || ! memberful_wp_is_connected_to_site() || ! is_user_logged_in() ) {
+    return;
+  }
+
+  if ( current_user_can( 'manage_options' ) ) {
+    return;
+  }
+
+  $enabled = (bool) get_option( 'memberful_expiry_banner_enabled', false );
+
+  /**
+   * Filters the expiry banner enabled status.
+   *
+   * @param bool $enabled The default enabled status.
+   *
+   * @return bool Whether the expiry banner is enabled.
+   */
+  $enabled = (bool) apply_filters( 'memberful_expiry_banner_enabled', $enabled );
+
+  if ( ! $enabled ) {
+    return;
+  }
+
+  $expiry_data = memberful_wp_get_soonest_expiring_subscription( get_current_user_id() );
+
+  if ( empty( $expiry_data ) ) {
+    return;
+  }
+
+  $account_url = memberful_account_url();
+  $message = memberful_wp_expiry_banner_message( $expiry_data, $account_url );
+
+  /**
+   * Filters the rendered expiry banner message.
+   *
+   * @param string $message     The banner message HTML string.
+   * @param array  $expiry_data The computed expiry data for the current user.
+   *
+   * @return string The filtered banner message HTML.
+   */
+  $message = apply_filters( 'memberful_expiry_banner_message', $message, $expiry_data );
+
+  ob_start();
+  memberful_wp_render(
+    'expiry-banner',
+    array(
+      'message' => $message
+    )
+  );
+  $html = ob_get_clean();
+
+  /**
+   * Filters the full expiry banner HTML output.
+   *
+   * @param string $html        The full banner HTML output.
+   * @param array  $expiry_data The computed expiry data for the current user.
+   *
+   * @return string The filtered banner HTML output.
+   */
+  echo apply_filters( 'memberful_expiry_banner_html', $html, $expiry_data );
+}
+
+/**
+ * Returns soonest subscription expiry data for a user within threshold.
+ *
+ * @param int $user_id User ID.
+ *
+ * @return array|null
+ */
+function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
+  $subscriptions = get_user_meta( $user_id, 'memberful_subscription', true );
+
+  if ( empty( $subscriptions ) || ! is_array( $subscriptions ) ) {
+    return null;
+  }
+
+  $days_threshold = min( 90, max( 1, (int) get_option( 'memberful_expiry_banner_days', 7 ) ) );
+
+  /**
+   * Filters the number of days before expiry that triggers the banner.
+   *
+   * @param int $days_threshold The configured day threshold.
+   *
+   * @return int The filtered day threshold.
+   */
+  $days_threshold = (int) apply_filters( 'memberful_expiry_banner_days_threshold', $days_threshold );
+  $days_threshold = min( 90, max( 1, $days_threshold ) );
+
+  $now = time();
+  $threshold_timestamp = $now + ( $days_threshold * DAY_IN_SECONDS );
+  $soonest = null;
+
+  foreach ( $subscriptions as $subscription ) {
+    if ( empty( $subscription['expires_at'] ) ) {
+      continue;
+    }
+
+    $expires_at = memberful_wp_parse_expiry_timestamp( $subscription['expires_at'] );
+
+    if ( empty( $expires_at ) ) {
+      continue;
+    }
+
+    if ( $expires_at > $threshold_timestamp ) {
+      continue;
+    }
+
+    if ( null === $soonest || $expires_at < $soonest['expires_at'] ) {
+      $seconds_remaining = $expires_at - $now;
+      $is_expired = $seconds_remaining < 0;
+      $days_remaining = $is_expired ? 0 : (int) ceil( $seconds_remaining / DAY_IN_SECONDS );
+
+      $soonest = array(
+        'expires_at' => $expires_at,
+        'days_remaining' => $days_remaining,
+        'is_expired' => $is_expired,
+      );
+    }
+  }
+
+  return $soonest;
+}
+
+/**
+ * Builds the user-facing banner message.
+ *
+ * @param array  $expiry_data Expiry information array.
+ * @param string $account_url Memberful account URL.
+ *
+ * @return string
+ */
+function memberful_wp_expiry_banner_message( array $expiry_data, $account_url ) {
+  $link = wp_sprintf(
+    '<a href="%s">%s</a>',
+    esc_url( $account_url ),
+    esc_html__( 'Update your membership', 'memberful' )
+  );
+
+  if ( ! empty( $expiry_data['is_expired'] ) ) {
+    return wp_sprintf(
+      /* translators: %s is the update membership link. */
+      __( 'Your membership has expired. %s.', 'memberful' ),
+      $link
+    );
+  }
+
+  if ( (int) $expiry_data['days_remaining'] <= 0 ) {
+    return wp_sprintf(
+      /* translators: %s is the update membership link. */
+      __( 'Your membership expires today. %s.', 'memberful' ),
+      $link
+    );
+  }
+
+  return wp_sprintf(
+    /* translators: 1: Number of days remaining. 2: Update membership link. */
+    _n(
+      'Your membership expires in %1$d day. %2$s.',
+      'Your membership expires in %1$d days. %2$s.',
+      (int) $expiry_data['days_remaining'],
+      'memberful'
+    ),
+    (int) $expiry_data['days_remaining'],
+    $link
+  );
+}
+
+/**
+ * Converts an expiry value into a Unix timestamp.
+ *
+ * @param mixed $expires_at Expiry value from user meta.
+ *
+ * @return int
+ */
+function memberful_wp_parse_expiry_timestamp( $expires_at ) {
+  if ( is_numeric( $expires_at ) ) {
+    return (int) $expires_at;
+  }
+
+  $parsed_time = strtotime( (string) $expires_at );
+
+  if ( false === $parsed_time ) {
+    return 0;
+  }
+
+  return (int) $parsed_time;
+}
diff --git a/wordpress/wp-content/plugins/memberful-wp/src/options.php b/wordpress/wp-content/plugins/memberful-wp/src/options.php
index 36394faa..23dd01f7 100755
--- a/wordpress/wp-content/plugins/memberful-wp/src/options.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/options.php
@@ -24,6 +24,8 @@ function memberful_wp_all_options() {
     'memberful_filter_account_menu_items' => TRUE,
     'memberful_auto_sync_display_names' => FALSE,
     'memberful_show_protected_content_in_search' => FALSE,
+    'memberful_expiry_banner_enabled' => false,
+    'memberful_expiry_banner_days' => 7,
     'memberful_use_global_marketing' => FALSE,
     'memberful_use_global_snippets' => TRUE,
     'memberful_global_marketing_override' => TRUE,
diff --git a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
new file mode 100644
index 00000000..58d301a1
--- /dev/null
+++ b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Global expiry banner view.
+ *
+ * @package Memberful
+ */
+
+?>
+<div
+  id="memberful-expiry-banner"
+  role="alert"
+  style="position:fixed;top:var(--wp-admin--admin-bar--height,0px);left:0;right:0;z-index:99999;display:flex;align-items:center;justify-content:center;gap:1em;padding:0.5em 1em;margin:0;font:inherit;font-size:0.875rem;line-height:1.4;background:#fef3cd;color:#664d03;border-bottom:1px solid #e0c882;"
+>
+  <p style="margin:0;"><?php echo wp_kses_post( $message ); ?></p>
+  <button
+    type="button"
+    aria-label="<?php echo esc_attr__( 'Dismiss membership expiry banner', 'memberful' ); ?>"
+    style="background:transparent;border:0;color:inherit;cursor:pointer;font:inherit;font-size:1rem;line-height:1;padding:0;"
+  >x</button>
+</div>
+<script>
+  (function() {
+    var key = 'memberful_expiry_banner_dismissed';
+    var banner = document.getElementById('memberful-expiry-banner');
+    if (!banner) {
+      return;
+    }
+
+    if (window.sessionStorage && window.sessionStorage.getItem(key) === '1') {
+      banner.style.display = 'none';
+      return;
+    }
+
+    var dismissButton = banner.querySelector('button');
+    if (!dismissButton) {
+      return;
+    }
+
+    dismissButton.addEventListener('click', function() {
+      if (window.sessionStorage) {
+        window.sessionStorage.setItem(key, '1');
+      }
+      banner.style.display = 'none';
+    });
+  })();
+</script>
diff --git a/wordpress/wp-content/plugins/memberful-wp/views/options.php b/wordpress/wp-content/plugins/memberful-wp/views/options.php
index 25772c92..66716573 100755
--- a/wordpress/wp-content/plugins/memberful-wp/views/options.php
+++ b/wordpress/wp-content/plugins/memberful-wp/views/options.php
@@ -58,6 +58,18 @@
             <span class="memberful-label__text--multiline">Show protected content in site search. <small>⚠️ Enabling this option will allow non-members to see protected content in WordPress search results.</small></span>
           </label>
         </p>
+        <p>
+          <label for="expiry_banner_enabled_checkbox">
+            <input id="expiry_banner_enabled_checkbox" class="memberful-label__checkbox--multiline" type="checkbox" name="memberful_expiry_banner_enabled" <?php if( $expiry_banner_enabled ): ?>checked="checked"<?php endif; ?>>
+            <span class="memberful-label__text--multiline">Show a banner to members whose membership is expiring soon or has expired.</span>
+          </label>
+        </p>
+        <p>
+          <label for="memberful_expiry_banner_days">
+            Show the expiry banner this many days before membership expiration.
+          </label><br>
+          <input id="memberful_expiry_banner_days" type="number" min="1" max="90" name="memberful_expiry_banner_days" value="<?php echo esc_attr( max( 1, (int) $expiry_banner_days ) ); ?>">
+        </p>
         <button type="submit" name="save_changes" class="button button-primary">Save Changes</button>
       </form>
     </div>

From 4eb48a4f982d1103dd3f08207942d24db36e7b9d Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Thu, 19 Feb 2026 11:32:41 +1100
Subject: [PATCH 02/13] Minify the expiry banner

---
 .../memberful-wp/views/expiry-banner.php      | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
index 58d301a1..d5caf329 100644
--- a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
@@ -18,29 +18,6 @@
     style="background:transparent;border:0;color:inherit;cursor:pointer;font:inherit;font-size:1rem;line-height:1;padding:0;"
   >x</button>
 </div>
-<script>
-  (function() {
-    var key = 'memberful_expiry_banner_dismissed';
-    var banner = document.getElementById('memberful-expiry-banner');
-    if (!banner) {
-      return;
-    }
-
-    if (window.sessionStorage && window.sessionStorage.getItem(key) === '1') {
-      banner.style.display = 'none';
-      return;
-    }
-
-    var dismissButton = banner.querySelector('button');
-    if (!dismissButton) {
-      return;
-    }
-
-    dismissButton.addEventListener('click', function() {
-      if (window.sessionStorage) {
-        window.sessionStorage.setItem(key, '1');
-      }
-      banner.style.display = 'none';
-    });
-  })();
+<script async defer>
+  !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(n)if(window.sessionStorage&&"1"===window.sessionStorage.getItem(e))n.style.display="none";else{var s=n.querySelector("button");s&&s.addEventListener("click",(function(){window.sessionStorage&&window.sessionStorage.setItem(e,"1"),n.style.display="none"}))}}();
 </script>

From 713d541177f424f37153f32d786864e2debb18b5 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Thu, 19 Feb 2026 12:21:20 +1100
Subject: [PATCH 03/13] Sure about styling and accessibility

---
 .../memberful-wp/src/expiry_banner.php        | 28 ++++++++++++++++++-
 .../memberful-wp/views/expiry-banner.php      | 22 +++++++--------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index fe028dc2..e89e2b8a 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -50,11 +50,37 @@ function memberful_wp_render_expiry_banner() {
    */
   $message = apply_filters( 'memberful_expiry_banner_message', $message, $expiry_data );
 
+  $is_expired = ! empty( $expiry_data['is_expired'] );
+  $aria_role = $is_expired ? 'alert' : 'status';
+  $aria_live = $is_expired ? 'assertive' : 'polite';
+
+  /**
+   * Filters the ARIA role used for the expiry banner live region.
+   *
+   * @param string $aria_role   The computed ARIA role.
+   * @param array  $expiry_data The computed expiry data for the current user.
+   *
+   * @return string The ARIA role for the banner.
+   */
+  $aria_role = (string) apply_filters( 'memberful_expiry_banner_aria_role', $aria_role, $expiry_data );
+
+  /**
+   * Filters the ARIA live mode used for the expiry banner.
+   *
+   * @param string $aria_live   The computed ARIA live value.
+   * @param array  $expiry_data The computed expiry data for the current user.
+   *
+   * @return string The ARIA live value for the banner.
+   */
+  $aria_live = (string) apply_filters( 'memberful_expiry_banner_aria_live', $aria_live, $expiry_data );
+
   ob_start();
   memberful_wp_render(
     'expiry-banner',
     array(
-      'message' => $message
+      'message' => $message,
+      'aria_role' => $aria_role,
+      'aria_live' => $aria_live,
     )
   );
   $html = ob_get_clean();
diff --git a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
index d5caf329..30621659 100644
--- a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
@@ -6,18 +6,16 @@
  */
 
 ?>
-<div
-  id="memberful-expiry-banner"
-  role="alert"
-  style="position:fixed;top:var(--wp-admin--admin-bar--height,0px);left:0;right:0;z-index:99999;display:flex;align-items:center;justify-content:center;gap:1em;padding:0.5em 1em;margin:0;font:inherit;font-size:0.875rem;line-height:1.4;background:#fef3cd;color:#664d03;border-bottom:1px solid #e0c882;"
->
-  <p style="margin:0;"><?php echo wp_kses_post( $message ); ?></p>
-  <button
-    type="button"
-    aria-label="<?php echo esc_attr__( 'Dismiss membership expiry banner', 'memberful' ); ?>"
-    style="background:transparent;border:0;color:inherit;cursor:pointer;font:inherit;font-size:1rem;line-height:1;padding:0;"
-  >x</button>
+<div id="memberful-expiry-banner" role="<?php echo esc_attr( $aria_role ); ?>" aria-live="<?php echo esc_attr( $aria_live ); ?>" class="memberful-expiry-banner">
+  <p class="memberful-expiry-banner__message"><?php echo wp_kses_post( $message ); ?></p>
+  <button type="button" class="memberful-expiry-banner__dismiss" aria-label="<?php echo esc_attr__( 'Dismiss membership expiry banner', 'memberful' ); ?>">
+    <span aria-hidden="true">&times;</span>
+    <span class="screen-reader-text"><?php echo esc_html__( 'Dismiss', 'memberful' ); ?></span>
+  </button>
 </div>
+<style>
+.memberful-expiry-banner{position:fixed;top:var(--wp-admin--admin-bar--height,0);left:0;right:0;z-index:var(--memberful-expiry-banner-z-index,9999);display:flex;align-items:center;justify-content:center;gap:1em;padding:.5em 1em;margin:0;font:inherit;font-size:.875rem;line-height:1.4;background:var(--memberful-expiry-banner-background,#fef3cd);color:var(--memberful-expiry-banner-colour,#664d03);border-bottom:1px solid var(--memberful-expiry-banner-border-colour,#e0c882)}.memberful-expiry-banner a{color:inherit;text-decoration:underline}.memberful-expiry-banner__message{margin:0}.memberful-expiry-banner__dismiss{min-width:2rem;min-height:2rem;margin:0;padding:0;border:0;background:0 0;color:inherit;cursor:pointer;font:inherit;font-size:1.25rem;line-height:1}
+</style>
 <script async defer>
-  !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(n)if(window.sessionStorage&&"1"===window.sessionStorage.getItem(e))n.style.display="none";else{var s=n.querySelector("button");s&&s.addEventListener("click",(function(){window.sessionStorage&&window.sessionStorage.setItem(e,"1"),n.style.display="none"}))}}();
+  !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(n)if(window.sessionStorage&&"1"===window.sessionStorage.getItem(e))n.style.display="none";else{var s=n.querySelector(".memberful-expiry-banner__dismiss");s&&s.addEventListener("click",(function(){window.sessionStorage&&window.sessionStorage.setItem(e,"1"),n.style.display="none"}))}}();
 </script>

From df08a9d0e86112c2e536a2671d3d9467fc1da981 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Wed, 25 Feb 2026 15:09:55 +1100
Subject: [PATCH 04/13] Adjust positioning of the expiry banner to push content
 down under admin bar (if present)

---
 .../memberful-wp/src/expiry_banner.php        | 24 ++++++++++++++++++-
 .../memberful-wp/views/expiry-banner.php      |  2 +-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index e89e2b8a..cc7e8720 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -1,6 +1,20 @@
 <?php
 
-add_action( 'wp_footer', 'memberful_wp_render_expiry_banner' );
+add_action( 'wp_body_open', 'memberful_wp_render_expiry_banner' );
+add_action( 'wp_footer', 'memberful_wp_render_expiry_banner_fallback' );
+
+/**
+ * Renders the expiry banner in footer for themes without wp_body_open support.
+ *
+ * @return void
+ */
+function memberful_wp_render_expiry_banner_fallback() {
+  if ( did_action( 'wp_body_open' ) ) {
+    return;
+  }
+
+  memberful_wp_render_expiry_banner();
+}
 
 /**
  * Renders the expiry banner on front end pages for eligible users.
@@ -8,6 +22,12 @@
  * @return void
  */
 function memberful_wp_render_expiry_banner() {
+  static $has_rendered = false;
+
+  if ( $has_rendered ) {
+    return;
+  }
+
   if ( is_admin() || ! memberful_wp_is_connected_to_site() || ! is_user_logged_in() ) {
     return;
   }
@@ -74,6 +94,8 @@ function memberful_wp_render_expiry_banner() {
    */
   $aria_live = (string) apply_filters( 'memberful_expiry_banner_aria_live', $aria_live, $expiry_data );
 
+  $has_rendered = true;
+
   ob_start();
   memberful_wp_render(
     'expiry-banner',
diff --git a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
index 30621659..562ca42f 100644
--- a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
@@ -17,5 +17,5 @@
 .memberful-expiry-banner{position:fixed;top:var(--wp-admin--admin-bar--height,0);left:0;right:0;z-index:var(--memberful-expiry-banner-z-index,9999);display:flex;align-items:center;justify-content:center;gap:1em;padding:.5em 1em;margin:0;font:inherit;font-size:.875rem;line-height:1.4;background:var(--memberful-expiry-banner-background,#fef3cd);color:var(--memberful-expiry-banner-colour,#664d03);border-bottom:1px solid var(--memberful-expiry-banner-border-colour,#e0c882)}.memberful-expiry-banner a{color:inherit;text-decoration:underline}.memberful-expiry-banner__message{margin:0}.memberful-expiry-banner__dismiss{min-width:2rem;min-height:2rem;margin:0;padding:0;border:0;background:0 0;color:inherit;cursor:pointer;font:inherit;font-size:1.25rem;line-height:1}
 </style>
 <script async defer>
-  !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(n)if(window.sessionStorage&&"1"===window.sessionStorage.getItem(e))n.style.display="none";else{var s=n.querySelector(".memberful-expiry-banner__dismiss");s&&s.addEventListener("click",(function(){window.sessionStorage&&window.sessionStorage.setItem(e,"1"),n.style.display="none"}))}}();
+  !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(!n)return;var t="memberful-expiry-banner-visible",o=document.getElementById("memberful-expiry-banner-bump-style");o||(o=document.createElement("style"),o.id="memberful-expiry-banner-bump-style",document.head.appendChild(o));var i=function(){var e="none"===n.style.display?0:n.offsetHeight;document.body&&document.body.classList.toggle(t,e>0),o.textContent="@media screen { html { margin-top: calc(var(--wp-admin--admin-bar--height, 0px) + "+e+"px) !important; } }"},r=function(){if(!window.sessionStorage)return!1;try{return"1"===window.sessionStorage.getItem(e)}catch(n){return!1}},s=function(){if(!window.sessionStorage)return;try{window.sessionStorage.setItem(e,"1")}catch(n){}};if(r())n.style.display="none";else{var a=n.querySelector(".memberful-expiry-banner__dismiss");a&&a.addEventListener("click",(function(){s(),n.style.display="none",i()}))}window.addEventListener("resize",i),window.addEventListener("orientationchange",i),i()}();
 </script>

From b37277325503d440df8e7fd0128454c4bef7476c Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Wed, 25 Feb 2026 15:10:52 +1100
Subject: [PATCH 05/13] Allow expiry banner to show for admins

---
 .../wp-content/plugins/memberful-wp/src/expiry_banner.php     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index cc7e8720..d64c320c 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -32,10 +32,6 @@ function memberful_wp_render_expiry_banner() {
     return;
   }
 
-  if ( current_user_can( 'manage_options' ) ) {
-    return;
-  }
-
   $enabled = (bool) get_option( 'memberful_expiry_banner_enabled', false );
 
   /**

From 940d1f11cc12047729f66e48b78bcd7cfb6f06f0 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Wed, 4 Mar 2026 12:53:28 +1100
Subject: [PATCH 06/13] Add mixed messaging for expiration of users with
 multiple subscriptions

---
 .../memberful-wp/src/expiry_banner.php        | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index d64c320c..23a4b819 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -143,22 +143,29 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
   $now = time();
   $threshold_timestamp = $now + ( $days_threshold * DAY_IN_SECONDS );
   $soonest = null;
+  $expiring_subscriptions_count = 0;
+  $active_subscriptions_count = 0;
 
   foreach ( $subscriptions as $subscription ) {
     if ( empty( $subscription['expires_at'] ) ) {
+      ++$active_subscriptions_count;
       continue;
     }
 
     $expires_at = memberful_wp_parse_expiry_timestamp( $subscription['expires_at'] );
 
     if ( empty( $expires_at ) ) {
+      ++$active_subscriptions_count;
       continue;
     }
 
     if ( $expires_at > $threshold_timestamp ) {
+      ++$active_subscriptions_count;
       continue;
     }
 
+    ++$expiring_subscriptions_count;
+
     if ( null === $soonest || $expires_at < $soonest['expires_at'] ) {
       $seconds_remaining = $expires_at - $now;
       $is_expired = $seconds_remaining < 0;
@@ -172,6 +179,13 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
     }
   }
 
+  if ( null === $soonest ) {
+    return null;
+  }
+
+  $soonest['expiring_subscriptions_count'] = $expiring_subscriptions_count;
+  $soonest['active_subscriptions_count'] = $active_subscriptions_count;
+
   return $soonest;
 }
 
@@ -189,8 +203,28 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
     esc_url( $account_url ),
     esc_html__( 'Update your membership', 'memberful' )
   );
+  $expiring_subscriptions_count = max( 1, (int) ( $expiry_data['expiring_subscriptions_count'] ?? 1 ) );
+  $active_subscriptions_count = max( 0, (int) ( $expiry_data['active_subscriptions_count'] ?? 0 ) );
+  $is_mixed_subscriptions = $active_subscriptions_count > 0;
+  $has_multiple_expiring_subscriptions = $expiring_subscriptions_count > 1;
 
   if ( ! empty( $expiry_data['is_expired'] ) ) {
+    if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
+      return wp_sprintf(
+        /* translators: %s is the update membership link. */
+        __( 'You have multiple subscriptions that have expired. %s.', 'memberful' ),
+        $link
+      );
+    }
+
+    if ( $is_mixed_subscriptions ) {
+      return wp_sprintf(
+        /* translators: %s is the update membership link. */
+        __( 'You have a subscription that has expired. %s.', 'memberful' ),
+        $link
+      );
+    }
+
     return wp_sprintf(
       /* translators: %s is the update membership link. */
       __( 'Your membership has expired. %s.', 'memberful' ),
@@ -199,6 +233,22 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   }
 
   if ( (int) $expiry_data['days_remaining'] <= 0 ) {
+    if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
+      return wp_sprintf(
+        /* translators: %s is the update membership link. */
+        __( 'You have multiple subscriptions expiring today. %s.', 'memberful' ),
+        $link
+      );
+    }
+
+    if ( $is_mixed_subscriptions ) {
+      return wp_sprintf(
+        /* translators: %s is the update membership link. */
+        __( 'You have a subscription expiring today. %s.', 'memberful' ),
+        $link
+      );
+    }
+
     return wp_sprintf(
       /* translators: %s is the update membership link. */
       __( 'Your membership expires today. %s.', 'memberful' ),
@@ -206,6 +256,34 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
     );
   }
 
+  if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
+    return wp_sprintf(
+      /* translators: 1: Number of days remaining. 2: Update membership link. */
+      _n(
+        'You have multiple subscriptions expiring in %1$d day. %2$s.',
+        'You have multiple subscriptions expiring in %1$d days. %2$s.',
+        (int) $expiry_data['days_remaining'],
+        'memberful'
+      ),
+      (int) $expiry_data['days_remaining'],
+      $link
+    );
+  }
+
+  if ( $is_mixed_subscriptions ) {
+    return wp_sprintf(
+      /* translators: 1: Number of days remaining. 2: Update membership link. */
+      _n(
+        'You have a subscription expiring in %1$d day. %2$s.',
+        'You have a subscription expiring in %1$d days. %2$s.',
+        (int) $expiry_data['days_remaining'],
+        'memberful'
+      ),
+      (int) $expiry_data['days_remaining'],
+      $link
+    );
+  }
+
   return wp_sprintf(
     /* translators: 1: Number of days remaining. 2: Update membership link. */
     _n(

From cb1e9273db5aa32ad30ede762411f73a03d170a2 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Wed, 18 Mar 2026 13:05:35 +1100
Subject: [PATCH 07/13] Wording changes making text more concise

---
 .../memberful-wp/src/expiry_banner.php        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index 23a4b819..404b971b 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -201,7 +201,7 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   $link = wp_sprintf(
     '<a href="%s">%s</a>',
     esc_url( $account_url ),
-    esc_html__( 'Update your membership', 'memberful' )
+    esc_html__( 'Renew now', 'memberful' )
   );
   $expiring_subscriptions_count = max( 1, (int) ( $expiry_data['expiring_subscriptions_count'] ?? 1 ) );
   $active_subscriptions_count = max( 0, (int) ( $expiry_data['active_subscriptions_count'] ?? 0 ) );
@@ -211,23 +211,23 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   if ( ! empty( $expiry_data['is_expired'] ) ) {
     if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
       return wp_sprintf(
-        /* translators: %s is the update membership link. */
-        __( 'You have multiple subscriptions that have expired. %s.', 'memberful' ),
+        /* translators: %s is the renewal link. */
+        __( 'Some of your subscriptions have expired. %s.', 'memberful' ),
         $link
       );
     }
 
     if ( $is_mixed_subscriptions ) {
       return wp_sprintf(
-        /* translators: %s is the update membership link. */
-        __( 'You have a subscription that has expired. %s.', 'memberful' ),
+        /* translators: %s is the renewal link. */
+        __( 'One of your subscriptions has expired. %s.', 'memberful' ),
         $link
       );
     }
 
     return wp_sprintf(
-      /* translators: %s is the update membership link. */
-      __( 'Your membership has expired. %s.', 'memberful' ),
+      /* translators: %s is the renewal link. */
+      __( 'Your subscription has expired. %s.', 'memberful' ),
       $link
     );
   }
@@ -235,33 +235,33 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   if ( (int) $expiry_data['days_remaining'] <= 0 ) {
     if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
       return wp_sprintf(
-        /* translators: %s is the update membership link. */
-        __( 'You have multiple subscriptions expiring today. %s.', 'memberful' ),
+        /* translators: %s is the renewal link. */
+        __( 'Some of your subscriptions expire today. %s.', 'memberful' ),
         $link
       );
     }
 
     if ( $is_mixed_subscriptions ) {
       return wp_sprintf(
-        /* translators: %s is the update membership link. */
-        __( 'You have a subscription expiring today. %s.', 'memberful' ),
+        /* translators: %s is the renewal link. */
+        __( 'One of your subscriptions expires today. %s.', 'memberful' ),
         $link
       );
     }
 
     return wp_sprintf(
-      /* translators: %s is the update membership link. */
-      __( 'Your membership expires today. %s.', 'memberful' ),
+      /* translators: %s is the renewal link. */
+      __( 'Your subscription expires today. %s.', 'memberful' ),
       $link
     );
   }
 
   if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
     return wp_sprintf(
-      /* translators: 1: Number of days remaining. 2: Update membership link. */
+      /* translators: 1: Number of days remaining. 2: Renewal link. */
       _n(
-        'You have multiple subscriptions expiring in %1$d day. %2$s.',
-        'You have multiple subscriptions expiring in %1$d days. %2$s.',
+        'Some of your subscriptions expire in %1$d day. %2$s.',
+        'Some of your subscriptions expire in %1$d days. %2$s.',
         (int) $expiry_data['days_remaining'],
         'memberful'
       ),
@@ -272,10 +272,10 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
 
   if ( $is_mixed_subscriptions ) {
     return wp_sprintf(
-      /* translators: 1: Number of days remaining. 2: Update membership link. */
+      /* translators: 1: Number of days remaining. 2: Renewal link. */
       _n(
-        'You have a subscription expiring in %1$d day. %2$s.',
-        'You have a subscription expiring in %1$d days. %2$s.',
+        'One of your subscriptions expires in %1$d day. %2$s.',
+        'One of your subscriptions expires in %1$d days. %2$s.',
         (int) $expiry_data['days_remaining'],
         'memberful'
       ),
@@ -285,10 +285,10 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   }
 
   return wp_sprintf(
-    /* translators: 1: Number of days remaining. 2: Update membership link. */
+    /* translators: 1: Number of days remaining. 2: Renewal link. */
     _n(
-      'Your membership expires in %1$d day. %2$s.',
-      'Your membership expires in %1$d days. %2$s.',
+      'Your subscription expires in %1$d day. %2$s.',
+      'Your subscription expires in %1$d days. %2$s.',
       (int) $expiry_data['days_remaining'],
       'memberful'
     ),

From 0f456a875c8d8778e75f8f7108848daac6318242 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Wed, 15 Apr 2026 15:38:24 +1000
Subject: [PATCH 08/13] Disable expiry banner when autorenew is on

---
 .../memberful-wp/src/expiry_banner.php        | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index 404b971b..b38077ef 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -164,11 +164,17 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
       continue;
     }
 
+    $seconds_remaining = $expires_at - $now;
+    $is_expired = $seconds_remaining < 0;
+
+    if ( ! $is_expired && memberful_wp_subscription_has_autorenew_enabled( $subscription ) ) {
+      ++$active_subscriptions_count;
+      continue;
+    }
+
     ++$expiring_subscriptions_count;
 
     if ( null === $soonest || $expires_at < $soonest['expires_at'] ) {
-      $seconds_remaining = $expires_at - $now;
-      $is_expired = $seconds_remaining < 0;
       $days_remaining = $is_expired ? 0 : (int) ceil( $seconds_remaining / DAY_IN_SECONDS );
 
       $soonest = array(
@@ -317,3 +323,18 @@ function memberful_wp_parse_expiry_timestamp( $expires_at ) {
 
   return (int) $parsed_time;
 }
+
+/**
+ * Checks whether subscription auto-renew is enabled.
+ *
+ * @param array $subscription Subscription data from user meta.
+ *
+ * @return bool
+ */
+function memberful_wp_subscription_has_autorenew_enabled( array $subscription ) {
+  if ( ! array_key_exists( 'autorenew', $subscription ) ) {
+    return false;
+  }
+
+  return wp_validate_boolean( $subscription['autorenew'] );
+}

From 949fa6206eb5d74f9498a5491633b22410a3f0d2 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Thu, 16 Apr 2026 16:48:52 +1000
Subject: [PATCH 09/13] Fix edge cases with banner messaging logic

---
 .../memberful-wp/src/expiry_banner.php        | 60 ++++++++++++++++---
 .../plugins/memberful-wp/src/options.php      |  2 +-
 .../memberful-wp/views/expiry-banner.php      |  2 +-
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index b38077ef..7fa71f86 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -174,7 +174,21 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
 
     ++$expiring_subscriptions_count;
 
-    if ( null === $soonest || $expires_at < $soonest['expires_at'] ) {
+    $should_replace_soonest = false;
+
+    if ( null === $soonest ) {
+      $should_replace_soonest = true;
+    } else {
+      $soonest_is_expired = ! empty( $soonest['is_expired'] );
+
+      if ( $soonest_is_expired && ! $is_expired ) {
+        $should_replace_soonest = true;
+      } elseif ( $soonest_is_expired === $is_expired && $expires_at < $soonest['expires_at'] ) {
+        $should_replace_soonest = true;
+      }
+    }
+
+    if ( $should_replace_soonest ) {
       $days_remaining = $is_expired ? 0 : (int) ceil( $seconds_remaining / DAY_IN_SECONDS );
 
       $soonest = array(
@@ -215,10 +229,18 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   $has_multiple_expiring_subscriptions = $expiring_subscriptions_count > 1;
 
   if ( ! empty( $expiry_data['is_expired'] ) ) {
-    if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
+    if ( $has_multiple_expiring_subscriptions ) {
+      if ( $is_mixed_subscriptions ) {
+        return wp_sprintf(
+          /* translators: %s is the renewal link. */
+          __( 'Some of your subscriptions have expired. %s.', 'memberful' ),
+          $link
+        );
+      }
+
       return wp_sprintf(
         /* translators: %s is the renewal link. */
-        __( 'Some of your subscriptions have expired. %s.', 'memberful' ),
+        __( 'Your subscriptions have expired. %s.', 'memberful' ),
         $link
       );
     }
@@ -239,10 +261,18 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   }
 
   if ( (int) $expiry_data['days_remaining'] <= 0 ) {
-    if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
+    if ( $has_multiple_expiring_subscriptions ) {
+      if ( $is_mixed_subscriptions ) {
+        return wp_sprintf(
+          /* translators: %s is the renewal link. */
+          __( 'Some of your subscriptions expire today. %s.', 'memberful' ),
+          $link
+        );
+      }
+
       return wp_sprintf(
         /* translators: %s is the renewal link. */
-        __( 'Some of your subscriptions expire today. %s.', 'memberful' ),
+        __( 'Your subscriptions expire today. %s.', 'memberful' ),
         $link
       );
     }
@@ -262,12 +292,26 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
     );
   }
 
-  if ( $is_mixed_subscriptions && $has_multiple_expiring_subscriptions ) {
+  if ( $has_multiple_expiring_subscriptions ) {
+    if ( $is_mixed_subscriptions ) {
+      return wp_sprintf(
+        /* translators: 1: Number of days remaining. 2: Renewal link. */
+        _n(
+          'Some of your subscriptions expire in %1$d day. %2$s.',
+          'Some of your subscriptions expire in %1$d days. %2$s.',
+          (int) $expiry_data['days_remaining'],
+          'memberful'
+        ),
+        (int) $expiry_data['days_remaining'],
+        $link
+      );
+    }
+
     return wp_sprintf(
       /* translators: 1: Number of days remaining. 2: Renewal link. */
       _n(
-        'Some of your subscriptions expire in %1$d day. %2$s.',
-        'Some of your subscriptions expire in %1$d days. %2$s.',
+        'Your subscriptions expire in %1$d day. %2$s.',
+        'Your subscriptions expire in %1$d days. %2$s.',
         (int) $expiry_data['days_remaining'],
         'memberful'
       ),
diff --git a/wordpress/wp-content/plugins/memberful-wp/src/options.php b/wordpress/wp-content/plugins/memberful-wp/src/options.php
index 23dd01f7..8171d53f 100755
--- a/wordpress/wp-content/plugins/memberful-wp/src/options.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/options.php
@@ -24,7 +24,7 @@ function memberful_wp_all_options() {
     'memberful_filter_account_menu_items' => TRUE,
     'memberful_auto_sync_display_names' => FALSE,
     'memberful_show_protected_content_in_search' => FALSE,
-    'memberful_expiry_banner_enabled' => false,
+    'memberful_expiry_banner_enabled' => FALSE,
     'memberful_expiry_banner_days' => 7,
     'memberful_use_global_marketing' => FALSE,
     'memberful_use_global_snippets' => TRUE,
diff --git a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
index 562ca42f..f09cec70 100644
--- a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
@@ -16,6 +16,6 @@
 <style>
 .memberful-expiry-banner{position:fixed;top:var(--wp-admin--admin-bar--height,0);left:0;right:0;z-index:var(--memberful-expiry-banner-z-index,9999);display:flex;align-items:center;justify-content:center;gap:1em;padding:.5em 1em;margin:0;font:inherit;font-size:.875rem;line-height:1.4;background:var(--memberful-expiry-banner-background,#fef3cd);color:var(--memberful-expiry-banner-colour,#664d03);border-bottom:1px solid var(--memberful-expiry-banner-border-colour,#e0c882)}.memberful-expiry-banner a{color:inherit;text-decoration:underline}.memberful-expiry-banner__message{margin:0}.memberful-expiry-banner__dismiss{min-width:2rem;min-height:2rem;margin:0;padding:0;border:0;background:0 0;color:inherit;cursor:pointer;font:inherit;font-size:1.25rem;line-height:1}
 </style>
-<script async defer>
+<script>
   !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(!n)return;var t="memberful-expiry-banner-visible",o=document.getElementById("memberful-expiry-banner-bump-style");o||(o=document.createElement("style"),o.id="memberful-expiry-banner-bump-style",document.head.appendChild(o));var i=function(){var e="none"===n.style.display?0:n.offsetHeight;document.body&&document.body.classList.toggle(t,e>0),o.textContent="@media screen { html { margin-top: calc(var(--wp-admin--admin-bar--height, 0px) + "+e+"px) !important; } }"},r=function(){if(!window.sessionStorage)return!1;try{return"1"===window.sessionStorage.getItem(e)}catch(n){return!1}},s=function(){if(!window.sessionStorage)return;try{window.sessionStorage.setItem(e,"1")}catch(n){}};if(r())n.style.display="none";else{var a=n.querySelector(".memberful-expiry-banner__dismiss");a&&a.addEventListener("click",(function(){s(),n.style.display="none",i()}))}window.addEventListener("resize",i),window.addEventListener("orientationchange",i),i()}();
 </script>

From 4c3a6613978c179c60ee9b2d58612984f156af6b Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Fri, 17 Apr 2026 09:47:57 +1000
Subject: [PATCH 10/13] Add same calender-day calculation logic for same day
 wording

---
 .../memberful-wp/src/expiry_banner.php        | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index 7fa71f86..ee9852e2 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -189,7 +189,7 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
     }
 
     if ( $should_replace_soonest ) {
-      $days_remaining = $is_expired ? 0 : (int) ceil( $seconds_remaining / DAY_IN_SECONDS );
+      $days_remaining = memberful_wp_get_subscription_days_remaining( $expires_at, $now );
 
       $soonest = array(
         'expires_at' => $expires_at,
@@ -368,6 +368,39 @@ function memberful_wp_parse_expiry_timestamp( $expires_at ) {
   return (int) $parsed_time;
 }
 
+/**
+ * Calculates remaining subscription days in the site timezone.
+ *
+ * @param int $expires_at Subscription expiry timestamp.
+ * @param int $now        Current timestamp.
+ *
+ * @return int
+ */
+function memberful_wp_get_subscription_days_remaining( $expires_at, $now ) {
+  if ( $expires_at <= $now ) {
+    return 0;
+  }
+
+  $timezone = wp_timezone();
+  $current_date = wp_date( 'Y-m-d', $now, $timezone );
+  $expiry_date = wp_date( 'Y-m-d', $expires_at, $timezone );
+
+  if ( $current_date === $expiry_date ) {
+    return 0;
+  }
+
+  $current_date_object = date_create_immutable_from_format( '!Y-m-d', $current_date, $timezone );
+  $expiry_date_object = date_create_immutable_from_format( '!Y-m-d', $expiry_date, $timezone );
+
+  if ( false === $current_date_object || false === $expiry_date_object ) {
+    return (int) ceil( ( $expires_at - $now ) / DAY_IN_SECONDS );
+  }
+
+  $days_remaining = (int) $current_date_object->diff( $expiry_date_object )->format( '%a' );
+
+  return max( 1, $days_remaining );
+}
+
 /**
  * Checks whether subscription auto-renew is enabled.
  *

From 8fa437f5e1123d48851f8d4a5e211ca188bcc8d6 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Fri, 17 Apr 2026 10:04:49 +1000
Subject: [PATCH 11/13] Unminify Expiry Banner JS, move to standard enqueue
 pattern

---
 .../memberful-wp/js/src/expiry-banner.js      | 71 +++++++++++++++++++
 .../memberful-wp/src/expiry_banner.php        | 32 +++++++++
 .../memberful-wp/views/expiry-banner.php      |  7 +-
 .../plugins/memberful-wp/webpack.config.js    |  1 +
 4 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 wordpress/wp-content/plugins/memberful-wp/js/src/expiry-banner.js

diff --git a/wordpress/wp-content/plugins/memberful-wp/js/src/expiry-banner.js b/wordpress/wp-content/plugins/memberful-wp/js/src/expiry-banner.js
new file mode 100644
index 00000000..15c88f4b
--- /dev/null
+++ b/wordpress/wp-content/plugins/memberful-wp/js/src/expiry-banner.js
@@ -0,0 +1,71 @@
+(() => {
+  const dismissStorageKey = "memberful_expiry_banner_dismissed";
+  const hiddenClass = "memberful-expiry-banner--js-hidden";
+  const visibleClass = "memberful-expiry-banner-visible";
+  const banner = document.getElementById("memberful-expiry-banner");
+
+  if (!banner) {
+    return;
+  }
+
+  let bumpStyle = document.getElementById("memberful-expiry-banner-bump-style");
+
+  if (!bumpStyle) {
+    bumpStyle = document.createElement("style");
+    bumpStyle.id = "memberful-expiry-banner-bump-style";
+    document.head.appendChild(bumpStyle);
+  }
+
+  const refreshOffset = () => {
+    const height = banner.classList.contains(hiddenClass) ? 0 : banner.offsetHeight;
+
+    if (document.body) {
+      document.body.classList.toggle(visibleClass, height > 0);
+    }
+
+    bumpStyle.textContent = `@media screen { html { margin-top: calc(var(--wp-admin--admin-bar--height, 0px) + ${height}px) !important; } }`;
+  };
+
+  const isDismissed = () => {
+    if (!window.sessionStorage) {
+      return false;
+    }
+
+    try {
+      return window.sessionStorage.getItem(dismissStorageKey) === "1";
+    } catch (error) {
+      return false;
+    }
+  };
+
+  const markDismissed = () => {
+    if (!window.sessionStorage) {
+      return;
+    }
+
+    try {
+      window.sessionStorage.setItem(dismissStorageKey, "1");
+    } catch (error) {
+      // Ignore session storage write failures.
+    }
+  };
+
+  if (isDismissed()) {
+    banner.classList.add(hiddenClass);
+  } else {
+    banner.classList.remove(hiddenClass);
+    const dismissButton = banner.querySelector(".memberful-expiry-banner__dismiss");
+
+    if (dismissButton) {
+      dismissButton.addEventListener("click", () => {
+        markDismissed();
+        banner.classList.add(hiddenClass);
+        refreshOffset();
+      });
+    }
+  }
+
+  window.addEventListener("resize", refreshOffset);
+  window.addEventListener("orientationchange", refreshOffset);
+  refreshOffset();
+})();
diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index ee9852e2..ba868e09 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -91,6 +91,7 @@ function memberful_wp_render_expiry_banner() {
   $aria_live = (string) apply_filters( 'memberful_expiry_banner_aria_live', $aria_live, $expiry_data );
 
   $has_rendered = true;
+  memberful_wp_enqueue_expiry_banner_script();
 
   ob_start();
   memberful_wp_render(
@@ -114,6 +115,37 @@ function memberful_wp_render_expiry_banner() {
   echo apply_filters( 'memberful_expiry_banner_html', $html, $expiry_data );
 }
 
+/**
+ * Enqueues the expiry banner script.
+ *
+ * @return void
+ */
+function memberful_wp_enqueue_expiry_banner_script() {
+  static $is_enqueued = false;
+
+  if ( $is_enqueued ) {
+    return;
+  }
+
+  $script_asset_path = MEMBERFUL_DIR . '/js/build/expiry-banner.asset.php';
+  $script_asset_info = file_exists( $script_asset_path )
+    ? include $script_asset_path
+    : array(
+      'dependencies' => array(),
+      'version' => MEMBERFUL_VERSION,
+    );
+
+  wp_enqueue_script(
+    'memberful-expiry-banner',
+    plugins_url( 'js/build/expiry-banner.js', MEMBERFUL_PLUGIN_FILE ),
+    $script_asset_info['dependencies'],
+    $script_asset_info['version'],
+    true
+  );
+
+  $is_enqueued = true;
+}
+
 /**
  * Returns soonest subscription expiry data for a user within threshold.
  *
diff --git a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
index f09cec70..af4b594d 100644
--- a/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/views/expiry-banner.php
@@ -6,7 +6,7 @@
  */
 
 ?>
-<div id="memberful-expiry-banner" role="<?php echo esc_attr( $aria_role ); ?>" aria-live="<?php echo esc_attr( $aria_live ); ?>" class="memberful-expiry-banner">
+<div id="memberful-expiry-banner" role="<?php echo esc_attr( $aria_role ); ?>" aria-live="<?php echo esc_attr( $aria_live ); ?>" class="memberful-expiry-banner memberful-expiry-banner--js-hidden">
   <p class="memberful-expiry-banner__message"><?php echo wp_kses_post( $message ); ?></p>
   <button type="button" class="memberful-expiry-banner__dismiss" aria-label="<?php echo esc_attr__( 'Dismiss membership expiry banner', 'memberful' ); ?>">
     <span aria-hidden="true">&times;</span>
@@ -14,8 +14,5 @@
   </button>
 </div>
 <style>
-.memberful-expiry-banner{position:fixed;top:var(--wp-admin--admin-bar--height,0);left:0;right:0;z-index:var(--memberful-expiry-banner-z-index,9999);display:flex;align-items:center;justify-content:center;gap:1em;padding:.5em 1em;margin:0;font:inherit;font-size:.875rem;line-height:1.4;background:var(--memberful-expiry-banner-background,#fef3cd);color:var(--memberful-expiry-banner-colour,#664d03);border-bottom:1px solid var(--memberful-expiry-banner-border-colour,#e0c882)}.memberful-expiry-banner a{color:inherit;text-decoration:underline}.memberful-expiry-banner__message{margin:0}.memberful-expiry-banner__dismiss{min-width:2rem;min-height:2rem;margin:0;padding:0;border:0;background:0 0;color:inherit;cursor:pointer;font:inherit;font-size:1.25rem;line-height:1}
+.memberful-expiry-banner{position:fixed;top:var(--wp-admin--admin-bar--height,0);left:0;right:0;z-index:var(--memberful-expiry-banner-z-index,9999);display:flex;align-items:center;justify-content:center;gap:1em;padding:.5em 1em;margin:0;font:inherit;font-size:.875rem;line-height:1.4;background:var(--memberful-expiry-banner-background,#fef3cd);color:var(--memberful-expiry-banner-colour,#664d03);border-bottom:1px solid var(--memberful-expiry-banner-border-colour,#e0c882)}.memberful-expiry-banner--js-hidden{display:none}.memberful-expiry-banner a{color:inherit;text-decoration:underline}.memberful-expiry-banner__message{margin:0}.memberful-expiry-banner__dismiss{min-width:2rem;min-height:2rem;margin:0;padding:0;border:0;background:0 0;color:inherit;cursor:pointer;font:inherit;font-size:1.25rem;line-height:1}
 </style>
-<script>
-  !function(){var e="memberful_expiry_banner_dismissed",n=document.getElementById("memberful-expiry-banner");if(!n)return;var t="memberful-expiry-banner-visible",o=document.getElementById("memberful-expiry-banner-bump-style");o||(o=document.createElement("style"),o.id="memberful-expiry-banner-bump-style",document.head.appendChild(o));var i=function(){var e="none"===n.style.display?0:n.offsetHeight;document.body&&document.body.classList.toggle(t,e>0),o.textContent="@media screen { html { margin-top: calc(var(--wp-admin--admin-bar--height, 0px) + "+e+"px) !important; } }"},r=function(){if(!window.sessionStorage)return!1;try{return"1"===window.sessionStorage.getItem(e)}catch(n){return!1}},s=function(){if(!window.sessionStorage)return;try{window.sessionStorage.setItem(e,"1")}catch(n){}};if(r())n.style.display="none";else{var a=n.querySelector(".memberful-expiry-banner__dismiss");a&&a.addEventListener("click",(function(){s(),n.style.display="none",i()}))}window.addEventListener("resize",i),window.addEventListener("orientationchange",i),i()}();
-</script>
diff --git a/wordpress/wp-content/plugins/memberful-wp/webpack.config.js b/wordpress/wp-content/plugins/memberful-wp/webpack.config.js
index b32e4222..738e9e7b 100644
--- a/wordpress/wp-content/plugins/memberful-wp/webpack.config.js
+++ b/wordpress/wp-content/plugins/memberful-wp/webpack.config.js
@@ -5,5 +5,6 @@ module.exports = {
   entry: {
     ...defaultConfig.entry,
     "editor-scripts": "./js/src/editor-scripts.js",
+    "expiry-banner": "./js/src/expiry-banner.js",
   },
 };

From 312e60850d901ffd162b68512e9aa82b643d41f2 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Fri, 17 Apr 2026 10:31:02 +1000
Subject: [PATCH 12/13] Minor refactor of filters in expiry banner rendering

---
 .../memberful-wp/src/expiry_banner.php        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index ba868e09..86867b4d 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -67,28 +67,28 @@ function memberful_wp_render_expiry_banner() {
   $message = apply_filters( 'memberful_expiry_banner_message', $message, $expiry_data );
 
   $is_expired = ! empty( $expiry_data['is_expired'] );
-  $aria_role = $is_expired ? 'alert' : 'status';
-  $aria_live = $is_expired ? 'assertive' : 'polite';
+  $aria_attributes = array(
+    'role' => $is_expired ? 'alert' : 'status',
+    'live' => $is_expired ? 'assertive' : 'polite',
+  );
 
   /**
-   * Filters the ARIA role used for the expiry banner live region.
+   * Filters the ARIA attributes used for the expiry banner live region.
    *
-   * @param string $aria_role   The computed ARIA role.
-   * @param array  $expiry_data The computed expiry data for the current user.
+   * @param array $aria_attributes {
+   *   ARIA attributes for the expiry banner.
    *
-   * @return string The ARIA role for the banner.
-   */
-  $aria_role = (string) apply_filters( 'memberful_expiry_banner_aria_role', $aria_role, $expiry_data );
-
-  /**
-   * Filters the ARIA live mode used for the expiry banner.
-   *
-   * @param string $aria_live   The computed ARIA live value.
-   * @param array  $expiry_data The computed expiry data for the current user.
+   *   @type string $role The ARIA role value.
+   *   @type string $live The ARIA live mode value.
+   * }
+   * @param array $expiry_data The computed expiry data for the current user.
    *
-   * @return string The ARIA live value for the banner.
+   * @return array The filtered ARIA attribute values.
    */
-  $aria_live = (string) apply_filters( 'memberful_expiry_banner_aria_live', $aria_live, $expiry_data );
+  $aria_attributes = apply_filters( 'memberful_expiry_banner_aria_attributes', $aria_attributes, $expiry_data );
+  $aria_attributes = is_array( $aria_attributes ) ? $aria_attributes : array();
+  $aria_role = isset( $aria_attributes['role'] ) ? (string) $aria_attributes['role'] : 'status';
+  $aria_live = isset( $aria_attributes['live'] ) ? (string) $aria_attributes['live'] : 'polite';
 
   $has_rendered = true;
   memberful_wp_enqueue_expiry_banner_script();

From 4c08d5515c6e3c25bfea21c774c7b01b17358590 Mon Sep 17 00:00:00 2001
From: Zachary Hickson <zhickson@thecode.co>
Date: Thu, 23 Apr 2026 09:10:22 +1000
Subject: [PATCH 13/13] Fix edge case by tracking expired_subscriptions_count

---
 .../memberful-wp/src/expiry_banner.php        | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
index 86867b4d..0debef36 100644
--- a/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
+++ b/wordpress/wp-content/plugins/memberful-wp/src/expiry_banner.php
@@ -176,6 +176,7 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
   $threshold_timestamp = $now + ( $days_threshold * DAY_IN_SECONDS );
   $soonest = null;
   $expiring_subscriptions_count = 0;
+  $expired_subscriptions_count = 0;
   $active_subscriptions_count = 0;
 
   foreach ( $subscriptions as $subscription ) {
@@ -205,6 +206,9 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
     }
 
     ++$expiring_subscriptions_count;
+    if ( $is_expired ) {
+      ++$expired_subscriptions_count;
+    }
 
     $should_replace_soonest = false;
 
@@ -236,6 +240,7 @@ function memberful_wp_get_soonest_expiring_subscription( $user_id ) {
   }
 
   $soonest['expiring_subscriptions_count'] = $expiring_subscriptions_count;
+  $soonest['expired_subscriptions_count'] = $expired_subscriptions_count;
   $soonest['active_subscriptions_count'] = $active_subscriptions_count;
 
   return $soonest;
@@ -256,9 +261,12 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
     esc_html__( 'Renew now', 'memberful' )
   );
   $expiring_subscriptions_count = max( 1, (int) ( $expiry_data['expiring_subscriptions_count'] ?? 1 ) );
+  $expired_subscriptions_count = max( 0, (int) ( $expiry_data['expired_subscriptions_count'] ?? 0 ) );
+  $upcoming_subscriptions_count = max( 0, $expiring_subscriptions_count - $expired_subscriptions_count );
   $active_subscriptions_count = max( 0, (int) ( $expiry_data['active_subscriptions_count'] ?? 0 ) );
   $is_mixed_subscriptions = $active_subscriptions_count > 0;
   $has_multiple_expiring_subscriptions = $expiring_subscriptions_count > 1;
+  $has_expired_subscriptions = $expired_subscriptions_count > 0;
 
   if ( ! empty( $expiry_data['is_expired'] ) ) {
     if ( $has_multiple_expiring_subscriptions ) {
@@ -293,6 +301,20 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
   }
 
   if ( (int) $expiry_data['days_remaining'] <= 0 ) {
+    if ( $has_expired_subscriptions ) {
+      return wp_sprintf(
+        /* translators: 1: Number of subscriptions expiring today. 2: Renewal link. */
+        _n(
+          'Some of your subscriptions have expired; another expires today. %2$s.',
+          'Some of your subscriptions have expired; %1$d others expire today. %2$s.',
+          $upcoming_subscriptions_count,
+          'memberful'
+        ),
+        $upcoming_subscriptions_count,
+        $link
+      );
+    }
+
     if ( $has_multiple_expiring_subscriptions ) {
       if ( $is_mixed_subscriptions ) {
         return wp_sprintf(
@@ -324,6 +346,43 @@ function memberful_wp_expiry_banner_message( array $expiry_data, $account_url )
     );
   }
 
+  if ( $has_expired_subscriptions ) {
+    if ( $upcoming_subscriptions_count <= 0 ) {
+      return wp_sprintf(
+        /* translators: %s is the renewal link. */
+        __( 'Some of your subscriptions have expired. %s.', 'memberful' ),
+        $link
+      );
+    }
+
+    if ( 1 === $upcoming_subscriptions_count ) {
+      return wp_sprintf(
+        /* translators: 1: Number of days remaining. 2: Renewal link. */
+        _n(
+          'Some of your subscriptions have expired; another expires in %1$d day. %2$s.',
+          'Some of your subscriptions have expired; another expires in %1$d days. %2$s.',
+          (int) $expiry_data['days_remaining'],
+          'memberful'
+        ),
+        (int) $expiry_data['days_remaining'],
+        $link
+      );
+    }
+
+    return wp_sprintf(
+      /* translators: 1: Number of subscriptions still expiring. 2: Number of days remaining. 3: Renewal link. */
+      _n(
+        'Some of your subscriptions have expired; %1$d others expire in %2$d day. %3$s.',
+        'Some of your subscriptions have expired; %1$d others expire in %2$d days. %3$s.',
+        (int) $expiry_data['days_remaining'],
+        'memberful'
+      ),
+      $upcoming_subscriptions_count,
+      (int) $expiry_data['days_remaining'],
+      $link
+    );
+  }
+
   if ( $has_multiple_expiring_subscriptions ) {
     if ( $is_mixed_subscriptions ) {
       return wp_sprintf(