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

Fix - Notice in invoice template with number_format

This commit is contained in:
Mike Jolley 2012-08-12 09:28:07 +01:00
parent 7c69f3a431
commit a7d7b6b6a6
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,21 +260,21 @@ class WC_Order {
/** Gets shipping and product tax */
function get_total_tax() {
return apply_filters( 'woocommerce_order_amount_total_tax', number_format( $this->order_tax + $this->order_shipping_tax, 2, '.', '' ) );
return apply_filters( 'woocommerce_order_amount_total_tax', number_format( (double) $this->order_tax + (double) $this->order_shipping_tax, 2, '.', '' ) );
}
/**
* gets the total (product) discount amount - these are applied before tax
*/
function get_cart_discount() {
return apply_filters( 'woocommerce_order_amount_cart_discount', number_format( $this->cart_discount, 2, '.', '' ) );
return apply_filters( 'woocommerce_order_amount_cart_discount', number_format( (double) $this->cart_discount, 2, '.', '' ) );
}
/**
* gets the total (product) discount amount - these are applied before tax
*/
function get_order_discount() {
return apply_filters( 'woocommerce_order_amount_order_discount', number_format( $this->order_discount, 2, '.', '' ) );
return apply_filters( 'woocommerce_order_amount_order_discount', number_format( (double) $this->order_discount, 2, '.', '' ) );
}
/**
@ -282,18 +282,23 @@ class WC_Order {
*/
function get_total_discount() {
if ($this->order_discount || $this->cart_discount) :
return apply_filters( 'woocommerce_order_amount_total_discount', number_format( $this->order_discount + $this->cart_discount, 2, '.', '' ) );
return apply_filters( 'woocommerce_order_amount_total_discount', number_format( (double) $this->order_discount + (double) $this->cart_discount, 2, '.', '' ) );
endif;
}
/** Gets shipping */
function get_shipping() {
return apply_filters( 'woocommerce_order_amount_shipping', number_format( $this->order_shipping, 2, '.', '' ) );
return apply_filters( 'woocommerce_order_amount_shipping', number_format( (double) $this->order_shipping, 2, '.', '' ) );
}
/** Gets shipping tax amount */
function get_shipping_tax() {
return apply_filters( 'woocommerce_order_amount_shipping_tax', number_format( $this->order_shipping_tax, 2, '.', '' ) );
return apply_filters( 'woocommerce_order_amount_shipping_tax', number_format( (double) $this->order_shipping_tax, 2, '.', '' ) );
}
/** Gets order total */
function get_total() {
return apply_filters( 'woocommerce_order_amount_total', number_format( (double) $this->order_total, 2, '.', '' ) );
}
/** Gets shipping method title */
@ -301,11 +306,6 @@ class WC_Order {
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', number_format( $this->order_total, 2, '.', '' ) );
}
/** Get item subtotal - this is the cost before discount */
function get_item_subtotal( $item, $inc_tax = false, $round = true ) {
if ($inc_tax) :

1
readme.txt
View File

@ -152,6 +152,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
= 1.6.4 =
* Fix - Missing grouped product cart buttons
* Fix - Notice in invoice template with number_format
= 1.6.3 - 10/08/2012 =
* Feature - Option to register using the email address as the username instead of entering a username