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 #5230 from ChromeOrange/master 

show shipping form filter
This commit is contained in:
Mike Jolley 2014-03-31 11:56:57 +01:00
parent 24c2c845b7 84899195c5
commit c981bb56ca
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1355,6 +1355,22 @@ class WC_Cart {
return apply_filters( 'woocommerce_cart_needs_shipping', $needs_shipping );
}
/**
* Should the shipping address form be shown
*
* @return bool
*/
function needs_shipping_address() {
$needs_shipping_address = false;
if ( WC()->cart->needs_shipping() === true && ! WC()->cart->ship_to_billing_address_only() ) {
$needs_shipping_address = true;
}
return apply_filters( 'woocommerce_cart_needs_shipping_address', $needs_shipping_address );
}
/**
* Sees if the customer has entered enough data to calc the shipping yet.
*

4
templates/checkout/form-shipping.php
View File

@ -10,7 +10,7 @@
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
?>
<div class="woocommerce-shipping-fields">
<?php if ( WC()->cart->needs_shipping() && ! WC()->cart->ship_to_billing_address_only() ) : ?>
<?php if ( WC()->cart->needs_shipping_address() === true ) : ?>
<?php
if ( empty( $_POST ) ) {
@ -65,4 +65,4 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
<?php endif; ?>
<?php do_action( 'woocommerce_after_order_notes', $checkout ); ?>
</div>
</div>