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

[2.3] Correct coupon % calc. Added inline note to prevent regression. 

Closes #8074
This commit is contained in:
Mike Jolley 2015-05-05 14:33:35 +01:00
parent 48d071731a
commit af6998fe4d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/class-wc-coupon.php
View File

@ -612,9 +612,13 @@ class WC_Coupon {
* *
* Get item discount by dividing item cost by subtotal to get a % * Get item discount by dividing item cost by subtotal to get a %
* *
* Uses price inc tax if prices include tax to work around https://github.com/woothemes/woocommerce/issues/7669 * Uses price inc tax if prices include tax to work around https://github.com/woothemes/woocommerce/issues/7669 and https://github.com/woothemes/woocommerce/issues/8074
*/ */
$discount_percent = ( $cart_item['data']->get_price_excluding_tax() * $cart_item_qty ) / WC()->cart->subtotal_ex_tax; if ( wc_prices_include_tax() ) {
$discount_percent = ( $cart_item['data']->get_price_including_tax() * $cart_item_qty ) / WC()->cart->subtotal;
} else {
$discount_percent = ( $cart_item['data']->get_price_excluding_tax() * $cart_item_qty ) / WC()->cart->subtotal_ex_tax;
}
$discount = ( $this->coupon_amount * $discount_percent ) / $cart_item_qty; $discount = ( $this->coupon_amount * $discount_percent ) / $cart_item_qty;
} elseif ( $this->is_type( 'fixed_product' ) ) { } elseif ( $this->is_type( 'fixed_product' ) ) {