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' into fix/17713

This commit is contained in:
Mike Jolley 2017-11-16 12:04:26 +00:00
parent 11d0293ddd 67144be628
commit 4e836754a8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/class-wc-discounts.php
View File

@ -853,7 +853,7 @@ class WC_Discounts {
protected function get_object_subtotal() { protected function get_object_subtotal() {
if ( is_a( $this->object, 'WC_Cart' ) ) { if ( is_a( $this->object, 'WC_Cart' ) ) {
return wc_add_number_precision( $this->object->get_displayed_subtotal() ); return wc_add_number_precision( $this->object->get_displayed_subtotal() );
} elseif ( is_a( $object, 'WC_Order' ) ) { } elseif ( is_a( $this->object, 'WC_Order' ) ) {
return wc_add_number_precision( $this->object->get_subtotal() ); return wc_add_number_precision( $this->object->get_subtotal() );
} else { } else {
return array_sum( wp_list_pluck( $this->items, 'price' ) ); return array_sum( wp_list_pluck( $this->items, 'price' ) );