Skip to content

Conversation

@miguelpeixe
Copy link
Member

All Submissions:

Changes proposed in this Pull Request:

NPPD-1006

The "update payment" notice should not render if another equivalent subscription is active. This PR implements this strategy by detecting active subscriptions within the variable subscription or grouped product.

How to test the changes in this Pull Request:

  1. Create 3 variable subscription products and a grouped product, grouping only 2 of the variable subscription products
  2. Create 2 checkout button blocks, targeting the grouped product and the ungrouped variable subscription product
  3. As a reader, subscribe via both buttons
  4. As an admin, generate a pending renewal order for each subscription:
image
  1. Back as the reader, navigate to My Account and confirm you get both notices
  2. Go through the checkout button flows again and make sure to select a different subscription product for the grouped product flow and a different variant for the variable subscription flow
  3. Now that you have an equivalent subscription for both types of product setup, go to the My Account page
  4. Confirm both notices are gone

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully ran tests with your changes locally?

@miguelpeixe miguelpeixe self-assigned this Dec 1, 2025
@miguelpeixe miguelpeixe requested a review from a team as a code owner December 1, 2025 14:57
@miguelpeixe miguelpeixe added the [Status] Needs Review The issue or pull request needs to be reviewed label Dec 1, 2025
Copy link
Contributor

@dkoo dkoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as described!

One thing I noticed not necessarily related to these changes, but the snackbar notices that show these notices outside of My Account are appearing inside the modal checkout—we should probably not be showing these inside the modal as they already appear in the "parent" page:

Image

@github-actions github-actions bot added [Status] Approved The pull request has been reviewed and is ready to merge and removed [Status] Needs Review The issue or pull request needs to be reviewed labels Dec 8, 2025
@miguelpeixe
Copy link
Member Author

Thanks, @dkoo! Filed NPPD-1054 for this

@miguelpeixe miguelpeixe merged commit 9a98889 into trunk Dec 8, 2025
9 checks passed
@miguelpeixe miguelpeixe deleted the fix/payment-notice-check-equivalent-subscription branch December 8, 2025 19:56
@github-actions
Copy link

github-actions bot commented Dec 8, 2025

Hey @miguelpeixe, good job getting this PR merged! 🎉

Now, the needs-changelog label has been added to it.

Please check if this PR needs to be included in the "Upcoming Changes" and "Release Notes" doc. If it doesn't, simply remove the label.

If it does, please add an entry to our shared document, with screenshots and testing instructions if applicable, then remove the label.

Thank you! ❤️

matticbot pushed a commit that referenced this pull request Dec 11, 2025
# [6.28.0-alpha.1](v6.27.1...v6.28.0-alpha.1) (2025-12-11)

### Bug Fixes

* **content-gating:** never gate special pages ([#4340](#4340)) ([a4dcfdd](a4dcfdd))
* **countdown-banner:** don't show on unrestricted posts ([#4349](#4349)) ([66d2c94](66d2c94))
* **indesign-export:** only register the attribute for allowed blocks ([#4330](#4330)) ([e1801cb](e1801cb))
* **my-account:** safe content argument to skip sanitization ([#4326](#4326)) ([b066de5](b066de5))
* **my-account:** set new payment method as default ([#4343](#4343)) ([6ebcaf9](6ebcaf9))
* **my-account:** support dynamic content around shortcode ([#4328](#4328)) ([36b9524](36b9524))
* **subscription-tiers-modal:** skip private products ([#4337](#4337)) ([564d803](564d803))

### Features

* **content-gate:** content rules ([#4265](#4265)) ([b5b8cd9](b5b8cd9))
* **content-gate:** implement restriction rules ([#4251](#4251)) ([4034103](4034103))
* metered content countdown banner ([#4315](#4315)) ([c9a68cc](c9a68cc))
* **payment-notice:** detect equivalent subscription ([#4333](#4333)) ([9a98889](9a98889))
* **ras:** OAuth OTP flow improvements ([#4341](#4341)) ([8b345fa](8b345fa))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 6.28.0-alpha.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Jan 5, 2026
# [6.28.0](v6.27.4...v6.28.0) (2026-01-05)

### Bug Fixes

* **content-gating:** never gate special pages ([#4340](#4340)) ([a4dcfdd](a4dcfdd))
* **countdown-banner:** don't show on unrestricted posts ([#4349](#4349)) ([66d2c94](66d2c94))
* **countdown-banner:** never show more views than total ([#4369](#4369)) ([0ef3a24](0ef3a24))
* **indesign-export:** only register the attribute for allowed blocks ([#4330](#4330)) ([e1801cb](e1801cb))
* **my-account:** safe content argument to skip sanitization ([#4326](#4326)) ([b066de5](b066de5))
* **my-account:** set new payment method as default ([#4343](#4343)) ([6ebcaf9](6ebcaf9))
* **my-account:** support dynamic content around shortcode ([#4328](#4328)) ([36b9524](36b9524))
* **subscription-tiers-modal:** skip private products ([#4337](#4337)) ([564d803](564d803))

### Features

* **content-gate:** content rules ([#4265](#4265)) ([b5b8cd9](b5b8cd9))
* **content-gate:** implement restriction rules ([#4251](#4251)) ([4034103](4034103))
* metered content countdown banner ([#4315](#4315)) ([c9a68cc](c9a68cc))
* **payment-notice:** detect equivalent subscription ([#4333](#4333)) ([9a98889](9a98889))
* **ras:** OAuth OTP flow improvements ([#4341](#4341)) ([8b345fa](8b345fa))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 6.28.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

released on @alpha released [Status] Approved The pull request has been reviewed and is ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants