Use undiscounted price for coupons

woocommerce · Mar 24, 2015 · 5e538b8 · 5e538b8
1 parent a49ac39
commit 5e538b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
@@ -1797,13 +1797,15 @@ public function get_discounted_price( $values, $price, $add_totals = false ) {
 				return $price;
 			}
 
-			if ( ! empty( $this->coupons ) ) {
+			$undiscounted_price = $price;
 
+			if ( ! empty( $this->coupons ) ) {
 				$product = $values['data'];
 
 				foreach ( $this->coupons as $code => $coupon ) {
 					if ( $coupon->is_valid() && ( $coupon->is_valid_for_product( $product, $values ) || $coupon->is_valid_for_cart() ) ) {
-						$discount_amount = $coupon->get_discount_amount( $price, $values, $single = true );
+						$discount_amount = $coupon->get_discount_amount( $undiscounted_price, $values, $single = true );
+						$discount_amount = min( $price, $discount_amount );
 						$price           = max( $price - $discount_amount, 0 );
 
 						// Store the totals for DISPLAY in the cart

diff --git a/readme.txt b/readme.txt
@@ -139,6 +139,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 == Changelog ==
 
 * Fix - Ensure coupon taxes are reset when calculating totals.
+* Tweak - Base discounts on the undiscounted price. #5874
 
 = 2.3.7 - 18/03/2015 =
 * Fix - Allow saving of empty download expiry date on orders.