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

Merge branch 'master' of github.com:woothemes/woocommerce

This commit is contained in:
Claudio Sanches 2015-12-18 20:46:42 -02:00
parent d85c643150 89ede21ff2
commit 19b4319ad4
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/woocommerce-layout.css
View File

File diff suppressed because one or more lines are too long

1
assets/css/woocommerce-layout.scss
View File

@ -320,6 +320,7 @@
.wc-terms-and-conditions, .terms { .wc-terms-and-conditions, .terms {
text-align: left; text-align: left;
padding: 0 1em 0 0; padding: 0 1em 0 0;
float:left;
} }
#place_order { #place_order {

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

@ -73,14 +73,14 @@ if ( ! defined( 'ABSPATH' ) ) {
<div class="form-row"> <div class="form-row">
<input type="hidden" name="woocommerce_pay" value="1" /> <input type="hidden" name="woocommerce_pay" value="1" />
<?php wc_get_template( 'checkout/terms.php' ); ?>
<?php do_action( 'woocommerce_pay_order_before_submit' ); ?> <?php do_action( 'woocommerce_pay_order_before_submit' ); ?>
<?php echo apply_filters( 'woocommerce_pay_order_button_html', '<input type="submit" class="button alt" id="place_order" value="' . esc_attr( $order_button_text ) . '" data-value="' . esc_attr( $order_button_text ) . '" />' ); ?> <?php echo apply_filters( 'woocommerce_pay_order_button_html', '<input type="submit" class="button alt" id="place_order" value="' . esc_attr( $order_button_text ) . '" data-value="' . esc_attr( $order_button_text ) . '" />' ); ?>
<?php do_action( 'woocommerce_pay_order_after_submit' ); ?> <?php do_action( 'woocommerce_pay_order_after_submit' ); ?>
<?php wc_get_template( 'checkout/terms.php' ); ?>
<?php wp_nonce_field( 'woocommerce-pay' ); ?> <?php wp_nonce_field( 'woocommerce-pay' ); ?>
</div> </div>
</div> </div>

4
templates/checkout/payment.php
View File

@ -42,14 +42,14 @@ if ( ! is_ajax() ) {
<br/><input type="submit" class="button alt" name="woocommerce_checkout_update_totals" value="<?php esc_attr_e( 'Update totals', 'woocommerce' ); ?>" /> <br/><input type="submit" class="button alt" name="woocommerce_checkout_update_totals" value="<?php esc_attr_e( 'Update totals', 'woocommerce' ); ?>" />
</noscript> </noscript>
<?php wc_get_template( 'checkout/terms.php' ); ?>
<?php do_action( 'woocommerce_review_order_before_submit' ); ?> <?php do_action( 'woocommerce_review_order_before_submit' ); ?>
<?php echo apply_filters( 'woocommerce_order_button_html', '<input type="submit" class="button alt" name="woocommerce_checkout_place_order" id="place_order" value="' . esc_attr( $order_button_text ) . '" data-value="' . esc_attr( $order_button_text ) . '" />' ); ?> <?php echo apply_filters( 'woocommerce_order_button_html', '<input type="submit" class="button alt" name="woocommerce_checkout_place_order" id="place_order" value="' . esc_attr( $order_button_text ) . '" data-value="' . esc_attr( $order_button_text ) . '" />' ); ?>
<?php do_action( 'woocommerce_review_order_after_submit' ); ?> <?php do_action( 'woocommerce_review_order_after_submit' ); ?>
<?php wc_get_template( 'checkout/terms.php' ); ?>
<?php wp_nonce_field( 'woocommerce-process_checkout' ); ?> <?php wp_nonce_field( 'woocommerce-process_checkout' ); ?>
</div> </div>
</div> </div>