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

Minor tweaks to cart shortcode

This commit is contained in:
Mike Jolley 2014-09-24 15:26:48 +01:00
parent 416d167842
commit 1c9331737e
2 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/class-wc-shortcodes.php
View File

@ -77,11 +77,14 @@ class WC_Shortcodes {
* Cart page shortcode.
*
* @access public
* @param mixed $atts
* @return string
*/
public static function cart( $atts ) {
return self::shortcode_wrapper( array( 'WC_Shortcode_Cart', 'output' ), $atts );
public static function cart() {
if ( ! is_null( WC()->cart ) ) {
return self::shortcode_wrapper( array( 'WC_Shortcode_Cart', 'output' ) );
} else {
return '';
}
}
/**

90
includes/shortcodes/class-wc-shortcode-cart.php
View File

@ -7,22 +7,53 @@
* @author WooThemes
* @category Shortcodes
* @package WooCommerce/Shortcodes/Cart
* @version 2.0.0
* @version 2.3.0
*/
class WC_Shortcode_Cart {
/**
* Output the cart shortcode.
*
* @param array $atts
* Calculate shipping for the cart
*/
public static function output( $atts ) {
public static function calculate_shipping() {
try {
WC()->shipping->reset_shipping();
// Check cart class is loaded or abort
if ( is_null( WC()->cart ) ) {
return;
$country = wc_clean( $_POST['calc_shipping_country'] );
$state = wc_clean( isset( $_POST['calc_shipping_state'] ) ? $_POST['calc_shipping_state'] : '' );
$postcode = apply_filters( 'woocommerce_shipping_calculator_enable_postcode', true ) ? wc_clean( $_POST['calc_shipping_postcode'] ) : '';
$city = apply_filters( 'woocommerce_shipping_calculator_enable_city', false ) ? wc_clean( $_POST['calc_shipping_city'] ) : '';
if ( $postcode && ! WC_Validation::is_postcode( $postcode, $country ) ) {
throw new Exception( __( 'Please enter a valid postcode/ZIP.', 'woocommerce' ) );
} elseif ( $postcode ) {
$postcode = wc_format_postcode( $postcode, $country );
}
if ( $country ) {
WC()->customer->set_location( $country, $state, $postcode, $city );
WC()->customer->set_shipping_location( $country, $state, $postcode, $city );
} else {
WC()->customer->set_to_base();
WC()->customer->set_shipping_to_base();
}
WC()->customer->calculated_shipping( true );
wc_add_notice( __( 'Shipping costs updated.', 'woocommerce' ), 'notice' );
do_action( 'woocommerce_calculated_shipping' );
} catch ( Exception $e ) {
if ( ! empty( $e ) ) {
wc_add_notice( $e->getMessage(), 'error' );
}
}
}
/**
* Output the cart shortcode.
*/
public static function output() {
// Constants
if ( ! defined( 'WOOCOMMERCE_CART' ) ) {
define( 'WOOCOMMERCE_CART', true );
@ -30,52 +61,19 @@ class WC_Shortcode_Cart {
// Update Shipping
if ( ! empty( $_POST['calc_shipping'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'woocommerce-cart' ) ) {
try {
WC()->shipping->reset_shipping();
$country = wc_clean( $_POST['calc_shipping_country'] );
$state = isset( $_POST['calc_shipping_state'] ) ? wc_clean( $_POST['calc_shipping_state'] ) : '';
$postcode = apply_filters( 'woocommerce_shipping_calculator_enable_postcode', true ) ? wc_clean( $_POST['calc_shipping_postcode'] ) : '';
$city = apply_filters( 'woocommerce_shipping_calculator_enable_city', false ) ? wc_clean( $_POST['calc_shipping_city'] ) : '';
if ( $postcode && ! WC_Validation::is_postcode( $postcode, $country ) ) {
throw new Exception( __( 'Please enter a valid postcode/ZIP.', 'woocommerce' ) );
} elseif ( $postcode ) {
$postcode = wc_format_postcode( $postcode, $country );
}
if ( $country ) {
WC()->customer->set_location( $country, $state, $postcode, $city );
WC()->customer->set_shipping_location( $country, $state, $postcode, $city );
} else {
WC()->customer->set_to_base();
WC()->customer->set_shipping_to_base();
}
WC()->customer->calculated_shipping( true );
wc_add_notice( __( 'Shipping costs updated.', 'woocommerce' ), 'notice' );
do_action( 'woocommerce_calculated_shipping' );
} catch ( Exception $e ) {
if ( ! empty( $e ) )
wc_add_notice( $e->getMessage(), 'error' );
}
self::calculate_shipping();
}
// Check cart items are valid
do_action('woocommerce_check_cart_items');
do_action( 'woocommerce_check_cart_items' );
// Calc totals
WC()->cart->calculate_totals();
if ( sizeof( WC()->cart->get_cart() ) == 0 )
if ( 0 === sizeof( WC()->cart->get_cart() ) ) {
wc_get_template( 'cart/cart-empty.php' );
else
} else {
wc_get_template( 'cart/cart.php' );
}
}
}