Show ECE buttons on products w/o shipping tax included in price, and improve tests #9954
+184
−74
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
added 2 commits
December 13, 2024 22:20
timur27
force-pushed
the
fix/ece-button-for-price-including-tax
branch
from
277749f to
a84ac6e
Compare
timur27
commented
Dec 13, 2024
Comment on lines
+112
to
+135
| public function test_filter_cart_needs_shipping_address_regular_products() { | ||
| $this->assertEquals( | ||
| true, | ||
| $this->system_under_test->filter_cart_needs_shipping_address( true ), | ||
| 'Should not modify shipping address requirement for regular products' | ||
| ); | ||
| } | ||
|
|
||
|
|
||
| public function test_filter_cart_needs_shipping_address_subscription_products() { | ||
| WC_Subscriptions_Cart::set_cart_contains_subscription( true ); | ||
| $this->mock_ece_button_helper->method( 'is_checkout' )->willReturn( true ); | ||
|
|
||
| $this->zone->delete_shipping_method( $this->flat_rate_id ); | ||
| $this->zone->delete_shipping_method( $this->local_pickup_id ); | ||
|
|
||
| $this->assertFalse( | ||
| $this->system_under_test->filter_cart_needs_shipping_address( true ), | ||
| 'Should not require shipping address for subscription without shipping methods' | ||
| ); | ||
|
|
||
| remove_filter( 'woocommerce_shipping_method_count', '__return_zero' ); | ||
| WC_Subscriptions_Cart::set_cart_contains_subscription( false ); | ||
| } |
There was a problem hiding this comment.
Those are two tests I took from test-class-wc-payments-express-checkout-button-helper.php and put into this file as these tests serve different purposes - they test WC_Payments_Express_Checkout_Button_Handler
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
|
Size Change: 0 B Total Size: 1.39 MB ℹ️ View Unchanged
|
timur27
requested review from
a team and
mdmoore
and removed request for
a team
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.
Fixes #9921
Changes proposed in this Pull Request
This PR adds the new part to the conditional responsible for filtering out the ece button based on whether it's not shippable and tax is calculated from billing address, which is not present.
we now check for the option selected under WooCommerce -> Settings -> Tax -> Prices entered with tax. If prices entered are inclusive of tax, we will consider that ECE button can be rendered even if does not have billing address.
This PR also refactors some tests in this area, because they were mocking the class that is under test and included tests for two classes under one test suite.
Testing instructions
npm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge