Don't load Apple/Google Pay for synced subscriptions that don't have payment due today and also require shipping #7582
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
|
Size Change: +38 B (0%) Total Size: 1.27 MB
ℹ️ View Unchanged
|
james-allan
requested changes
Nov 2, 2023
Mayisha
approved these changes
Nov 2, 2023
|
@mattallan I have reviewed the changes and approved the PR as things are fixed. But you may need to consider the scenario @james-allan raised about variations. |
…f ALL variations pass
…h express payment methods
|
Thanks @Mayisha and @james-allan. I've refactored the This means if you have a subscription that has one variation that is valid for express payment methods and another that is not, the button will still appear on the product page for it and only show for variations that are supported, here's a quick screencast showcasing this:
|
4 tasks
james-allan
force-pushed
the
fix/3742-synced-subscriptions-payment-requests
branch
from
65c5d02 to
4bbfc67
Compare
james-allan
reviewed
Nov 7, 2023
james-allan
requested changes
Nov 7, 2023
There was a problem hiding this comment.
Hey @mattallan.
Changes look good and works. I left a comment suggesting that we can remove the is_today() check. I believe that isn't necessary given the is_payment_upfront() function includes an equivalent check. :)
Co-authored-by: James Allan <james.allan@automattic.com>
|
Thanks for the suggestion @james-allan. I had to fix the psalm issues and unit tests but this is good for a final review Edit: I've ran through the standard tests on the latest changes |
…show PRB on the page load after
|
While copying these changes over to our Stripe gateway, I found a few more issues over there that are also issues in WooPayments. Here are the individual fixes I've pushed up to this PR:
@james-allan did you mind taking this PR for another spin? 🙏 Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3742
Changes proposed in this Pull Request
When customers attempt to use Apple Pay or Google Pay to purchase a synchronized subscription product that has no upfront costs (i.e. trial period or delayed initial payment due to product being synced) and also requires shipping, they're met with an error on the page:
Inside our
WC_Payments_Payment_Request_Button_Handlerclass, we have code that prevents non-virtual (physical) products with free trials from being purchased with Apple/Google Pay, however there isn't any code to handle products that imitate a free trial period like what we do to handle synchronised subscription purchased outside of the synced date with no initial payment.In this PR, I've introduced a new function to check if the product is a subscription product and has a free trial period (either trial set on the product or is a synced product), and requires shipping, and if so, prevent loading the Apple Pay/Google Pay buttons on the page.
Testing instructions
developbranch, view the product page and note the Payment Request buttons (PRB) are loaded. If you attempt to purchase this product with PRB, you will see the above error.Other test cases to run:
npm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge