Rebase `wcs-migration` branch onto `trunk`

Automattic / woocommerce-services

WooCommerce Services is a feature plugin that integrates hosted services into WooCommerce (3.0+), and currently includes automated tax rates and the ability to purchase and print USPS shipping labels.

GNU General Public License v2.0

108 stars 20 forks source link

Rebase `wcs-migration` branch onto `trunk` #2783

Closed Ferdev closed 3 months ago

Ferdev commented 3 months ago

Description

This PR rebases the wcs-migration branch onto trunk.

Related issue(s)

N/A

Steps to reproduce & screenshots/GIFs

Check out latest trunk in woocommerce-shipping.
Check out this branch.
Make sure you can enable both plugins, and the migration flow banners work as expected.

Checklist

[ ] unit tests

[ ] changelog.txt entry added
[ ] readme.txt entry added

Ferdev commented 3 months ago

@kallehauge this is ready for review! It took me several tries to get the rebase right, there were a lot of refactoring, and the last merge commit to fix conflicts with wcs-migration was introducing duplicated code. Anyway, let me know if you find anything incorrect :+1: