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

Jetpack Sync: Ensure HPOS order status is prefixed with 'wc-' before sending it to WPCOM #38258

Merged
merged 7 commits into from
Jul 10, 2024

Conversation

fgiannar
Copy link
Contributor

@fgiannar fgiannar commented Jul 9, 2024

Jetpack Sync: Ensure HPOS order status is prefixed with wc- before sending it to WPCOM

This is needed so that when we insert custom order statuses in the corresponding wc_orders table on WPCOM, we get the proper wc- prefix. We are handling the issue in the Sync package end since wc_get_order_statuses is not available when the corresponding Sync action is processed.

Proposed changes:

  • Automattic\Jetpack\Sync\Modules\WooCommerce_HPOS_Orders: Introduce a wrapper for wc_get_order_statuses in case it's not present, but also to handle a bug in the WooCommerce codebase, since wc-checkout-draft is missing
  • Automattic\Jetpack\Sync\Modules\WooCommerce_HPOS_Orders: Update filter_order_data to prefix the order status with wc- when applicable before sending the order to WPCOM

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

p9dueE-8ec-p2

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

No

Testing instructions:

Copy link
Contributor

github-actions bot commented Jul 9, 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 update/sync-hpos-add-wc-order-status-prefix branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack update/sync-hpos-add-wc-order-status-prefix
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/sync-hpos-add-wc-order-status-prefix
    

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
Copy link
Contributor

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

@fgiannar fgiannar added [Status] Needs Review To request a review from Crew. Label will be renamed soon. and removed [Status] In Progress labels Jul 9, 2024
*/
protected function get_all_possible_order_status_keys() {
$order_statuses = array( 'checkout-draft', 'auto-draft', 'trash' );
$order_statuses = array( 'auto-draft', 'trash' );
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vedanshujain Just a confirmation if we should include draft here. In our discussion you mentioned that draft is a potential order status, however based on the Woo check upon setting the status, it looks like it's not.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, looks like we are actively changing draft to pending in case it is set. so this implementation looks good,

@fgiannar fgiannar self-assigned this Jul 10, 2024
Copy link
Contributor

@darssen darssen left a comment

Choose a reason for hiding this comment

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

Tests well! 👍

Copy link
Contributor

@vedanshujain vedanshujain left a comment

Choose a reason for hiding this comment

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

LGTM

@fgiannar fgiannar merged commit 0edc338 into trunk Jul 10, 2024
72 checks passed
@fgiannar fgiannar deleted the update/sync-hpos-add-wc-order-status-prefix branch July 10, 2024 10:15
@github-actions github-actions bot removed the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Jul 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants