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

pebkak-proofing cart page. Closes #1375.

This commit is contained in:
Mike Jolley 2012-08-21 17:23:26 +01:00
parent 40cc7b997d
commit 9f2a5f07e6
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/cart/cart.php
View File

@ -120,7 +120,8 @@ global $woocommerce;
</div>
<?php } ?>
<input type="submit" class="button" name="update_cart" value="<?php _e('Update Cart', 'woocommerce'); ?>" /> <a href="<?php echo esc_url( $woocommerce->cart->get_checkout_url() ); ?>" class="checkout-button button alt"><?php _e('Proceed to Checkout &rarr;', 'woocommerce'); ?></a>
<input type="submit" class="button" name="update_cart" value="<?php _e('Update Cart', 'woocommerce'); ?>" /> <input type="submit" class="checkout-button button alt" name="proceed" value="<?php _e('Proceed to Checkout &rarr;', 'woocommerce'); ?>" />
<?php do_action('woocommerce_proceed_to_checkout'); ?>
<?php $woocommerce->nonce_field('cart') ?>

40
woocommerce-functions.php
View File

@ -163,7 +163,7 @@ function woocommerce_update_cart_action() {
global $woocommerce;
// Remove from cart
if ( isset($_GET['remove_item']) && $_GET['remove_item'] && $woocommerce->verify_nonce('cart', '_GET')) :
if ( isset($_GET['remove_item']) && $_GET['remove_item'] && $woocommerce->verify_nonce('cart', '_GET')) {
$woocommerce->cart->set_quantity( $_GET['remove_item'], 0 );
@ -174,12 +174,12 @@ function woocommerce_update_cart_action() {
exit;
// Update Cart
elseif (isset($_POST['update_cart']) && $_POST['update_cart'] && $woocommerce->verify_nonce('cart')) :
} elseif ( ( ! empty( $_POST['update_cart'] ) || ! empty( $_POST['proceed'] ) ) && $woocommerce->verify_nonce('cart')) {
$cart_totals = isset( $_POST['cart'] ) ? $_POST['cart'] : '';
if (sizeof($woocommerce->cart->get_cart())>0) :
foreach ($woocommerce->cart->get_cart() as $cart_item_key => $values) :
if ( sizeof( $woocommerce->cart->get_cart() ) > 0 ) {
foreach ( $woocommerce->cart->get_cart() as $cart_item_key => $values ) {
$_product = $values['data'];
@ -194,28 +194,32 @@ function woocommerce_update_cart_action() {
$passed_validation = apply_filters('woocommerce_update_cart_validation', true, $cart_item_key, $values, $quantity);
// Check downloadable items
if ( get_option('woocommerce_limit_downloadable_product_qty')=='yes' ) :
if ( $_product->is_downloadable() && $_product->is_virtual() && $quantity > 1 ) :
if ( get_option('woocommerce_limit_downloadable_product_qty') == 'yes' ) {
if ( $_product->is_downloadable() && $_product->is_virtual() && $quantity > 1 ) {
$woocommerce->add_error( sprintf(__('You can only have 1 %s in your cart.', 'woocommerce'), $_product->get_title()) );
$passed_validation = false;
endif;
endif;
}
}
if ($passed_validation) {
if ( $passed_validation )
$woocommerce->cart->set_quantity( $cart_item_key, $quantity );
}
endforeach;
endif;
}
}
$woocommerce->add_message( __('Cart updated.', 'woocommerce') );
if ( ! empty( $_POST['proceed'] ) ) {
wp_safe_redirect( $woocommerce->cart->get_checkout_url() );
exit;
} else {
$woocommerce->add_message( __('Cart updated.', 'woocommerce') );
$referer = ( wp_get_referer() ) ? wp_get_referer() : $woocommerce->cart->get_cart_url();
$referer = remove_query_arg( 'remove_discounts', $referer );
wp_safe_redirect( $referer );
exit;
$referer = ( wp_get_referer() ) ? wp_get_referer() : $woocommerce->cart->get_cart_url();
$referer = remove_query_arg( 'remove_discounts', $referer );
wp_safe_redirect( $referer );
exit;
}
endif;
}
}