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

Show shipping. Closes #933.

This commit is contained in:
Mike Jolley 2012-06-12 17:22:54 +01:00
parent db21fa13f4
commit 517c6186cb
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/class-wc-order.php
View File

@ -296,6 +296,11 @@ class WC_Order {
return apply_filters( 'woocommerce_order_amount_shipping_tax', $this->order_shipping_tax );
}
/** Gets shipping method title */
function get_shipping_method() {
return apply_filters( 'woocommerce_order_shipping_method', ucwords( $this->shipping_method_title ) );
}
/** Gets order total */
function get_total() {
return apply_filters( 'woocommerce_order_amount_total', $this->order_total );
@ -456,7 +461,7 @@ class WC_Order {
function get_shipping_to_display() {
global $woocommerce;
if ($this->order_shipping > 0) :
if ( $this->order_shipping > 0 ) :
$tax_text = '';
@ -478,8 +483,10 @@ class WC_Order {
endif;
$shipping .= sprintf( __('&nbsp;<small>%svia %s</small>', 'woocommerce'), $tax_text, ucwords( $this->shipping_method_title ) );
$shipping .= sprintf( __('&nbsp;<small>%svia %s</small>', 'woocommerce'), $tax_text, $this->get_shipping_method() );
elseif ( $this->get_shipping_method() ) :
$shipping = $this->get_shipping_method();
else :
$shipping = __('Free!', 'woocommerce');
endif;
@ -522,7 +529,7 @@ class WC_Order {
if ( $this->get_cart_discount() > 0 )
$total_rows[ __( 'Cart Discount:', 'woocommerce' ) ] = '-' . $this->get_cart_discount_to_display();
if ( $this->get_shipping() > 0 )
if ( $this->get_shipping_method() )
$total_rows[ __('Shipping:', 'woocommerce') ] = $this->get_shipping_to_display();
if ( $this->get_total_tax() > 0 ) {

1
readme.txt
View File

@ -192,6 +192,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Tweak - Cart widget respects cart tax settings
* Tweak - Exempt from VAT shows price ex VAT
* Tweak - Newlines for order meta (flat)
* Tweak - Show method title when free
* Fix - Strange error where detecting the page (is_page etc) would break the canonical redirect in some instances when hooked into 'wp'. Used the later get_header hook instead.
* Fix - Right now links.
* Fix - fix for https://bugs.php.net/bug.php?id=61166 (thanks Max Rice)