Wrap billing and shipping fields with a div/class Closes #4758
This commit is contained in:
Mike Jolley
Coen Jacobs
parent
c19ae08099
commit
e81c3abacc
|
|
@ -4,64 +4,63 @@
|
|||
*
|
||||
* @author WooThemes
|
||||
* @package WooCommerce/Templates
|
||||
* @version 2.0.0
|
||||
* @version 2.1.2
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
|
||||
|
||||
global $woocommerce;
|
||||
?>
|
||||
<div class="woocommerce-billing-fields">
|
||||
<?php if ( WC()->cart->ship_to_billing_address_only() && WC()->cart->needs_shipping() ) : ?>
|
||||
|
||||
<?php if ( WC()->cart->ship_to_billing_address_only() && WC()->cart->needs_shipping() ) : ?>
|
||||
<h3><?php _e( 'Billing & Shipping', 'woocommerce' ); ?></h3>
|
||||
|
||||
<h3><?php _e( 'Billing & Shipping', 'woocommerce' ); ?></h3>
|
||||
<?php else : ?>
|
||||
|
||||
<?php else : ?>
|
||||
|
||||
<h3><?php _e( 'Billing Address', 'woocommerce' ); ?></h3>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_before_checkout_billing_form', $checkout ); ?>
|
||||
|
||||
<?php foreach ( $checkout->checkout_fields['billing'] as $key => $field ) : ?>
|
||||
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php do_action('woocommerce_after_checkout_billing_form', $checkout ); ?>
|
||||
|
||||
<?php if ( ! is_user_logged_in() && $checkout->enable_signup ) : ?>
|
||||
|
||||
<?php if ( $checkout->enable_guest_checkout ) : ?>
|
||||
|
||||
<p class="form-row form-row-wide create-account">
|
||||
<input class="input-checkbox" id="createaccount" <?php checked( ( true === $checkout->get_value( 'createaccount' ) || ( true === apply_filters( 'woocommerce_create_account_default_checked', false ) ) ), true) ?> type="checkbox" name="createaccount" value="1" /> <label for="createaccount" class="checkbox"><?php _e( 'Create an account?', 'woocommerce' ); ?></label>
|
||||
</p>
|
||||
<h3><?php _e( 'Billing Address', 'woocommerce' ); ?></h3>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_before_checkout_registration_form', $checkout ); ?>
|
||||
<?php do_action( 'woocommerce_before_checkout_billing_form', $checkout ); ?>
|
||||
|
||||
<?php if ( ! empty( $checkout->checkout_fields['account'] ) ) : ?>
|
||||
<?php foreach ( $checkout->checkout_fields['billing'] as $key => $field ) : ?>
|
||||
|
||||
<div class="create-account">
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
|
||||
<p><?php _e( 'Create an account by entering the information below. If you are a returning customer please login at the top of the page.', 'woocommerce' ); ?></p>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php foreach ( $checkout->checkout_fields['account'] as $key => $field ) : ?>
|
||||
<?php do_action('woocommerce_after_checkout_billing_form', $checkout ); ?>
|
||||
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
<?php if ( ! is_user_logged_in() && $checkout->enable_signup ) : ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
<?php if ( $checkout->enable_guest_checkout ) : ?>
|
||||
|
||||
<div class="clear"></div>
|
||||
<p class="form-row form-row-wide create-account">
|
||||
<input class="input-checkbox" id="createaccount" <?php checked( ( true === $checkout->get_value( 'createaccount' ) || ( true === apply_filters( 'woocommerce_create_account_default_checked', false ) ) ), true) ?> type="checkbox" name="createaccount" value="1" /> <label for="createaccount" class="checkbox"><?php _e( 'Create an account?', 'woocommerce' ); ?></label>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_before_checkout_registration_form', $checkout ); ?>
|
||||
|
||||
<?php if ( ! empty( $checkout->checkout_fields['account'] ) ) : ?>
|
||||
|
||||
<div class="create-account">
|
||||
|
||||
<p><?php _e( 'Create an account by entering the information below. If you are a returning customer please login at the top of the page.', 'woocommerce' ); ?></p>
|
||||
|
||||
<?php foreach ( $checkout->checkout_fields['account'] as $key => $field ) : ?>
|
||||
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
</div>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_after_checkout_registration_form', $checkout ); ?>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_after_checkout_registration_form', $checkout ); ?>
|
||||
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
|
@ -4,66 +4,65 @@
|
|||
*
|
||||
* @author WooThemes
|
||||
* @package WooCommerce/Templates
|
||||
* @version 1.6.4
|
||||
* @version 2.1.2
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
|
||||
|
||||
global $woocommerce;
|
||||
?>
|
||||
<div class="woocommerce-shipping-fields">
|
||||
<?php if ( WC()->cart->needs_shipping() && ! WC()->cart->ship_to_billing_address_only() ) : ?>
|
||||
|
||||
<?php if ( WC()->cart->needs_shipping() && ! WC()->cart->ship_to_billing_address_only() ) : ?>
|
||||
<?php
|
||||
if ( empty( $_POST ) ) {
|
||||
|
||||
<?php
|
||||
if ( empty( $_POST ) ) {
|
||||
$ship_to_different_address = get_option( 'woocommerce_ship_to_billing' ) == 'no' ? 1 : 0;
|
||||
$ship_to_different_address = apply_filters( 'woocommerce_ship_to_different_address_checked', $ship_to_different_address );
|
||||
|
||||
$ship_to_different_address = get_option( 'woocommerce_ship_to_billing' ) == 'no' ? 1 : 0;
|
||||
$ship_to_different_address = apply_filters( 'woocommerce_ship_to_different_address_checked', $ship_to_different_address );
|
||||
} else {
|
||||
|
||||
} else {
|
||||
$ship_to_different_address = $checkout->get_value( 'ship_to_different_address' );
|
||||
|
||||
$ship_to_different_address = $checkout->get_value( 'ship_to_different_address' );
|
||||
}
|
||||
?>
|
||||
|
||||
}
|
||||
?>
|
||||
<h3 id="ship-to-different-address">
|
||||
<label for="ship-to-different-address-checkbox" class="checkbox"><?php _e( 'Ship to a different address?', 'woocommerce' ); ?></label>
|
||||
<input id="ship-to-different-address-checkbox" class="input-checkbox" <?php checked( $ship_to_different_address, 1 ); ?> type="checkbox" name="ship_to_different_address" value="1" />
|
||||
</h3>
|
||||
|
||||
<h3 id="ship-to-different-address">
|
||||
<label for="ship-to-different-address-checkbox" class="checkbox"><?php _e( 'Ship to a different address?', 'woocommerce' ); ?></label>
|
||||
<input id="ship-to-different-address-checkbox" class="input-checkbox" <?php checked( $ship_to_different_address, 1 ); ?> type="checkbox" name="ship_to_different_address" value="1" />
|
||||
</h3>
|
||||
<div class="shipping_address">
|
||||
|
||||
<div class="shipping_address">
|
||||
<?php do_action( 'woocommerce_before_checkout_shipping_form', $checkout ); ?>
|
||||
|
||||
<?php do_action( 'woocommerce_before_checkout_shipping_form', $checkout ); ?>
|
||||
<?php foreach ( $checkout->checkout_fields['shipping'] as $key => $field ) : ?>
|
||||
|
||||
<?php foreach ( $checkout->checkout_fields['shipping'] as $key => $field ) : ?>
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_after_checkout_shipping_form', $checkout ); ?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_before_order_notes', $checkout ); ?>
|
||||
|
||||
<?php if ( apply_filters( 'woocommerce_enable_order_notes_field', get_option( 'woocommerce_enable_order_comments', 'yes' ) === 'yes' ) ) : ?>
|
||||
|
||||
<?php if ( ! WC()->cart->needs_shipping() || WC()->cart->ship_to_billing_address_only() ) : ?>
|
||||
|
||||
<h3><?php _e( 'Additional Information', 'woocommerce' ); ?></h3>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php foreach ( $checkout->checkout_fields['order'] as $key => $field ) : ?>
|
||||
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_after_checkout_shipping_form', $checkout ); ?>
|
||||
|
||||
</div>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_before_order_notes', $checkout ); ?>
|
||||
|
||||
<?php if ( apply_filters( 'woocommerce_enable_order_notes_field', get_option( 'woocommerce_enable_order_comments', 'yes' ) === 'yes' ) ) : ?>
|
||||
|
||||
<?php if ( ! WC()->cart->needs_shipping() || WC()->cart->ship_to_billing_address_only() ) : ?>
|
||||
|
||||
<h3><?php _e( 'Additional Information', 'woocommerce' ); ?></h3>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php foreach ( $checkout->checkout_fields['order'] as $key => $field ) : ?>
|
||||
|
||||
<?php woocommerce_form_field( $key, $field, $checkout->get_value( $key ) ); ?>
|
||||
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<?php do_action( 'woocommerce_after_order_notes', $checkout ); ?>
|
||||
<?php do_action( 'woocommerce_after_order_notes', $checkout ); ?>
|
||||
</div>
|
||||
Loading…
Reference in New Issue