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

Adjust total discount for ex.tax

This commit is contained in:
Mike Jolley 2017-08-15 16:00:38 +01:00
parent 7a44c3d700
commit 3c18d5e849
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/class-wc-cart-totals.php
View File

@ -558,7 +558,9 @@ final class WC_Cart_Totals {
} }
} }
$coupon_discount_amounts[ $coupon_code ] -= $coupon_discount_tax_amounts[ $coupon_code ]; if ( wc_prices_include_tax() ) {
$coupon_discount_amounts[ $coupon_code ] -= $coupon_discount_tax_amounts[ $coupon_code ];
}
} }
} }

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

@ -469,7 +469,8 @@ class WC_Discounts {
$discount = wc_add_number_precision( apply_filters( 'woocommerce_coupon_get_discount_amount', wc_remove_number_precision( $discount ), wc_remove_number_precision( $price_to_discount ), $item->object, false, $coupon ) ); $discount = wc_add_number_precision( apply_filters( 'woocommerce_coupon_get_discount_amount', wc_remove_number_precision( $discount ), wc_remove_number_precision( $price_to_discount ), $item->object, false, $coupon ) );
} }
$total_discount += min( $discounted_price, $discount ); $discount = min( $discounted_price, $discount );
$total_discount += $discount;
// Store code and discount amount per item. // Store code and discount amount per item.
$this->discounts[ $coupon->get_code() ][ $item->key ] += $discount; $this->discounts[ $coupon->get_code() ][ $item->key ] += $discount;
@ -513,7 +514,8 @@ class WC_Discounts {
$discount = wc_add_number_precision( apply_filters( 'woocommerce_coupon_get_discount_amount', wc_remove_number_precision( $discount ), wc_remove_number_precision( $price_to_discount ), $item->object, false, $coupon ) ); $discount = wc_add_number_precision( apply_filters( 'woocommerce_coupon_get_discount_amount', wc_remove_number_precision( $discount ), wc_remove_number_precision( $price_to_discount ), $item->object, false, $coupon ) );
} }
$total_discount += min( $discounted_price, $discount ); $discount = min( $discounted_price, $discount );
$total_discount += $discount;
// Store code and discount amount per item. // Store code and discount amount per item.
$this->discounts[ $coupon->get_code() ][ $item->key ] += $discount; $this->discounts[ $coupon->get_code() ][ $item->key ] += $discount;