Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/payments correct link to setup plans #38767

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from

Conversation

simison
Copy link
Member

@simison simison commented Aug 7, 2024

Resolves #38766

Links opening payment setup for Jetpack & WP.com sites now open to wordpress.com/earn/ for everyone. This changes Jetpack sites to go for Jetpack Cloud version instead.

image

Proposed changes:

  • Link to Jetpack Cloud for Monetize UI for Jetpack sites

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  • Add subscribe block; "setup plan" should bring you to Jetpack Cloud from Jetpack site.
  • Sync PR to WP.com, and try the block there. You should end up in Monetize dash in Calypso blue.
  • See Jetpack -> Settings -> Earn, and all setup links now point to Jetpack Cloud. This UI is just for Jetpack sites.

@simison simison added [Type] Bug When a feature is broken and / or not performing as intended [Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. [Block] Payments aka Unified Intro [Block] Payment Buttons labels Aug 7, 2024
Copy link
Contributor

github-actions bot commented Aug 7, 2024

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the fix/payments-correct-link-to-setup-plans branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack fix/payments-correct-link-to-setup-plans
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions github-actions bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label Aug 7, 2024
@simison simison requested a review from a team August 7, 2024 14:57
Copy link
Contributor

github-actions bot commented Aug 7, 2024

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • 🔴 Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!


Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for September 3, 2024 (scheduled code freeze on September 2, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Aug 7, 2024
@simison
Copy link
Member Author

simison commented Aug 7, 2024

There are "untangled" sites among WP.com sites which should also get redirected to JP cloud, but we can look into those separately.

@simison simison added [Status] Needs Review To request a review from Crew. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Aug 7, 2024
? 'https://cloud.jetpack.com/monetize/payments/'
: 'https://wordpress.com/earn/payments/';

const link = base + location.hostname;
Copy link
Member

Choose a reason for hiding this comment

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

This may be a good opportunity to move away from location.hostname, which won't return the correct information on sites that live in a subdirectory.

Could we rely on getRedirectUrl() here maybe?

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like a combo of getRedirectUrl() and getSiteFragment() would be best, and there are other places with /earn links where this is needed. Like Donations block.

@simison simison force-pushed the fix/payments-correct-link-to-setup-plans branch from d956d7e to e34bfa0 Compare August 14, 2024 14:17
@github-actions github-actions bot added [Block] Subscriptions Admin Page React-powered dashboard under the Jetpack menu [Tests] Includes Tests labels Aug 14, 2024
@simison simison force-pushed the fix/payments-correct-link-to-setup-plans branch 2 times, most recently from 3e3338b to 54342d0 Compare August 14, 2024 20:35
Copy link
Contributor

@pkuliga pkuliga left a comment

Choose a reason for hiding this comment

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

It seems it contains more fixes, not only for the "Set up a paid plan" link.

Can you add some testing instructions to make it clear how to test it?

@anomiex anomiex added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Aug 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Page React-powered dashboard under the Jetpack menu [Block] Payment Buttons [Block] Payments aka Unified Intro [Block] Subscriptions [Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Tests] Includes Tests [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix "Set up a paid plan" link in Subscribe Block
4 participants