Merge trunk into wcs-migration branch
#2778
Closed
Conversation
This file contains 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
…2754) * Bump tested up to version * add changelog * update readme file
This reverts commit 122c7b3.
This reverts commit 642db4f.
…he Destination is Within EU (#2764) * add condition for EU tariff number * add changelog * edit the tariff number error text * edit changelog
…active (#2761) * Rough take * Do not change the name, this is still called WooCommerce Shipping & Tax * Set `wc_services_will_handle_coexistence_with_woo_shipping_and_woo_tax` hook to indicate we will handle the coexistence * Remove WC_Connect_Note_DHL_Live_Rates_Available notice todo My concern was about the class not existing and thereby creating PHP fatal errors, but we require the file right before using it, so there's no issue even if shipping has not been generally initiated. * Remove outdated todos * Status page should respect shipping conditional loading (#2776) * Conditionally hide shipping related status data * Satisfy tests * Introduce new "wc_services_will_disable_shipping_logic" hook (#2775) * Reimplement logic that completely blocks WCS&T logic from initiating * Introduce new hook for conditional loading --------- Co-authored-by: Gerhard <potgieterg@gmail.com>
Ferdev
requested review from
a team and
kallehauge
and removed request for
a team
|
I've tried to run the e2e tests locally, but even checking out npm run test:e2e-docker-up
npm run test:e2e |
|
You bet! Giving it a swing now @Ferdev. Edit: Trunk is working for me, so giving the branch a go again |
|
I'm closing this PR in favor of #2783, which rebases instead of merging trunk, which makes the whole merge cleaner. If you don't mind, I'm gonna add you as reviewer in the other PR, @kallehauge 😇 |
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.
Description
This PR merge the latest changes from the trunk branch into the wcs-migration branch.
Related issue(s)
N/A
Steps to reproduce & screenshots/GIFs
trunkin woocommerce-shipping.Checklist
changelog.txtentry addedreadme.txtentry added