Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27143 from woocommerce/fix/26876 

Fix "Hide shipping costs until an address is entered"
This commit is contained in:
Claudio Sanches 2020-08-11 20:06:17 -03:00 committed by GitHub
parent cbfe4bd595 de383971eb
commit 29bc98816e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/class-wc-cart.php
View File

@ -1425,10 +1425,8 @@ class WC_Cart extends WC_Legacy_Cart {
}
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;
}
}

62
tests/php/includes/class-wc-cart-test.php Normal file
View File

@ -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( '' );
}
}