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.

Sign up for GitHub

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

Jump to bottom

Fix "Hide shipping costs until an address is entered" #27143

Merged
merged 3 commits into from Aug 11, 2020
Merged

Fix "Hide shipping costs until an address is entered" #27143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08620cf
Make "woocommerce_shipping_cost_requires_address" strict
claudiosanches Jul 28, 2020
0f09140
Test WC_Cart::show_shipping()
claudiosanches Jul 28, 2020
de38397
Reset all after test
claudiosanches Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions includes/class-wc-cart.php
View file
Open in desktop
Expand Up @@ -1396,10 +1396,8 @@ public function show_shipping() {
}

if ( 'yes' === get_option( 'woocommerce_shipping_cost_requires_address' ) ) {
if ( ! $this->get_customer()->has_calculated_shipping() ) {
if ( ! $this->get_customer()->get_shipping_country() || ( ! $this->get_customer()->get_shipping_state() && ! $this->get_customer()->get_shipping_postcode() ) ) {
return false;
}
if ( ! $this->get_customer()->get_shipping_country() || ! $this->get_customer()->get_shipping_state() || ! $this->get_customer()->get_shipping_postcode() ) {
return false;
}
}

Expand Down
62 changes: 62 additions & 0 deletions tests/php/includes/class-wc-cart-test.php
View file
Open in desktop
@@ -0,0 +1,62 @@
<?php
/**
* Unit tests for the WC_Cart_Test class.
*
* @package WooCommerce\Tests\Cart.
*/

/**
* Class WC_Cart_Test
*/
class WC_Cart_Test extends \WC_Unit_Test_Case {

/**
* tearDown.
*/
public function tearDown() {
parent::tearDown();

WC()->cart->empty_cart();
WC()->customer->set_is_vat_exempt( false );
WC()->session->set( 'wc_notices', null );
}

/**
* Test show shipping.
*/
public function test_show_shipping() {
// Test with an empty cart.
$this->assertFalse( WC()->cart->show_shipping() );

// Add a product to the cart.
$product = WC_Helper_Product::create_simple_product();
WC()->cart->add_to_cart( $product->get_id(), 1 );

// Test with "woocommerce_ship_to_countries" disabled.
$default_ship_to_countries = get_option( 'woocommerce_ship_to_countries', '' );
update_option( 'woocommerce_ship_to_countries', 'disabled' );
$this->assertFalse( WC()->cart->show_shipping() );

// Test with default "woocommerce_ship_to_countries" and "woocommerce_shipping_cost_requires_address".
update_option( 'woocommerce_ship_to_countries', $default_ship_to_countries );
$this->assertTrue( WC()->cart->show_shipping() );

// Test with "woocommerce_shipping_cost_requires_address" enabled.
$default_shipping_cost_requires_address = get_option( 'woocommerce_shipping_cost_requires_address', 'no' );
update_option( 'woocommerce_shipping_cost_requires_address', 'yes' );
$this->assertFalse( WC()->cart->show_shipping() );

// Set address for shipping calculation required for "woocommerce_shipping_cost_requires_address".
WC()->cart->get_customer()->set_shipping_country( 'US' );
WC()->cart->get_customer()->set_shipping_state( 'NY' );
WC()->cart->get_customer()->set_shipping_postcode( '12345' );
$this->assertTrue( WC()->cart->show_shipping() );

// Reset.
update_option( 'woocommerce_shipping_cost_requires_address', $default_shipping_cost_requires_address );
$product->delete( true );
WC()->cart->get_customer()->set_shipping_country( 'GB' );
WC()->cart->get_customer()->set_shipping_state( '' );
WC()->cart->get_customer()->set_shipping_postcode( '' );
}
}