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

Social: Fix plan slug in My-Jetpack #38222

Merged
merged 4 commits into from
Jul 9, 2024
Merged

Conversation

gmjuhasz
Copy link
Contributor

@gmjuhasz gmjuhasz commented Jul 5, 2024

Fixes https://github.com/Automattic/jetpack-reach/issues/443

Proposed changes:

  • Fixed the purchase slug from My-Jetpack for Social

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

https://github.com/Automattic/jetpack-reach/issues/443

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

No.

Testing instructions:

  • Create a new JN site, or delete jetpack options on your local site to reset the flows. jetpack docker wp option delete jetpack_options. You'll have to reconnect Jetpack after this.
  • Ensure you do not have any social plans.
  • Go to /wp-admin/admin.php?page=my-jetpack, scroll down and click Learn more at Social. After clicking the CTA it should be the new Jetpack Social plan in your cart.
CleanShot.2024-07-05.at.16.12.17.png.mp4

Without this change the Basic plan will be added to the siteless checkout cart

Copy link
Contributor

github-actions bot commented Jul 5, 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/social-my-jetpack-plan-slug branch.

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

    bin/jetpack-downloader test jetpack fix/social-my-jetpack-plan-slug
    

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
@gmjuhasz gmjuhasz requested a review from a team July 5, 2024 14:18
Copy link
Contributor

github-actions bot commented Jul 5, 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.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

@gmjuhasz gmjuhasz self-assigned this Jul 5, 2024
@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 Jul 5, 2024
@gmjuhasz gmjuhasz added [Status] Needs Team Review 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 Jul 5, 2024
spsiddarthan
spsiddarthan previously approved these changes Jul 6, 2024
@pablinos
Copy link
Contributor

pablinos commented Jul 8, 2024

It looks like this comment https://github.com/Automattic/jetpack/pull/38222/files#diff-2c0ded5ba3e8d6e74c2c398693d38bf14935cbd39deaebc10d003f5cd715a0dbR3 is wrong too, which we might want to fix while we're here.

Without this change the Basic plan will be added to the siteless checkout cart

If I've come from a site, what's happened to get into the siteless checkout flow?

Can we prevent the old Basic/Advanced plans from being purchased in the siteless flow?

@gmjuhasz
Copy link
Contributor Author

gmjuhasz commented Jul 8, 2024

If I've come from a site, what's happened to get into the siteless checkout flow?

Can we prevent the old Basic/Advanced plans from being purchased in the siteless flow?

To be honest I'm not sure. What happened here is that you buy it siteless, but your site will be automatically selected right after like on the license screen. I'm not sure why it's done like that, probably has to do with the logic in My jetpack.

@gmjuhasz
Copy link
Contributor Author

gmjuhasz commented Jul 8, 2024

@pablinos fixed the comment

@spsiddarthan
Copy link
Contributor

Can we prevent the old Basic/Advanced plans from being purchased in the siteless flow?

Yes, can mark the plans as unsellable. I have added a task to the backlog for this.

@gmjuhasz gmjuhasz merged commit 1fcedae into trunk Jul 9, 2024
70 checks passed
@gmjuhasz gmjuhasz deleted the fix/social-my-jetpack-plan-slug branch July 9, 2024 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants