feat(payment): regional pricing, Stripe price id, OAuth domain (→ staging) - #1058
Closed
rdahis wants to merge 5 commits into
Closed
feat(payment): regional pricing, Stripe price id, OAuth domain (→ staging)#1058rdahis wants to merge 5 commits into
rdahis wants to merge 5 commits into
Conversation
Member
Author
|
Closing — not needed. These changes are already present in
#1057 (→ |
This file contains hidden or 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
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.
Warning
Do not merge until
staginghas been reset tomain.Merging now conflicts, because
stagingstill carries these same changes under theiroriginal SHAs. After the reset this applies cleanly.
Reconstructs the payment/account work onto
main.These commits were originally pushed to
stagingunder the old workflow.stagingisscheduled to be reset to
main, so they have been cherry-picked onto a branch cut frommainper the current Git Flow.What's here
StripePriceNodeCareer.team_old/role_oldTwo further staging-only commits (the
convert_form_fieldgraphql fix and #1038 spatialcoverage) are already on
mainunder different SHAs — cherry-picking them came out empty,so they are correctly omitted.
Heads-up for the deploy
account/0029_remove_career_team_old_remove_career_role_old— itdrops two columns. Chain is intact; its dependency
0028_alter_account_uuidis already onmain.maindoes not yet have the product-aware webhook refactor that exists onstaging. Theregional-pricing hook applied cleanly into
setup_intent_succeeded, but CI (especiallytest_regional_pricing.py) is the real check, since a clean cherry-pick is textual, not semantic.blocking checkout.
Deploy order
Merge and deploy before the website PR of the same name.