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

Adjust discount on min/max spend to work based on the displayed subtotal.

This commit is contained in:
Gerhard Potgieter 2017-11-15 13:44:07 +02:00
parent 0436e9afcb
commit 4521011219
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
View File

@ -117,7 +117,7 @@ class WC_Meta_Box_Coupon_Data {
'id' => 'minimum_amount',
'label' => __( 'Minimum spend', 'woocommerce' ),
'placeholder' => __( 'No minimum', 'woocommerce' ),
'description' => __( 'This field allows you to set the minimum spend (subtotal, including taxes) allowed to use the coupon.', 'woocommerce' ),
'description' => __( 'This field allows you to set the minimum spend (displayed subtotal) allowed to use the coupon.', 'woocommerce' ),
'data_type' => 'price',
'desc_tip' => true,
) );
@ -127,7 +127,7 @@ class WC_Meta_Box_Coupon_Data {
'id' => 'maximum_amount',
'label' => __( 'Maximum spend', 'woocommerce' ),
'placeholder' => __( 'No maximum', 'woocommerce' ),
'description' => __( 'This field allows you to set the maximum spend (subtotal, including taxes) allowed when using the coupon.', 'woocommerce' ),
'description' => __( 'This field allows you to set the maximum spend (displayed subtotal) allowed when using the coupon.', 'woocommerce' ),
'data_type' => 'price',
'desc_tip' => true,
) );

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

@ -40,11 +40,11 @@ class WC_Discounts {
protected $discounts = array();
/**
* Total taxes
* Displayed subtotal of the cart/order
*
* @var array
* @var integer
*/
protected $tax_total = 0;
protected $subtotal = 0;
/**
* Constructor.
@ -79,7 +79,7 @@ class WC_Discounts {
*/
public function set_items_from_cart( $cart ) {
$this->items = $this->discounts = array();
$this->tax_total = 0;
$this->subtotal = 0;
if ( ! is_a( $cart, 'WC_Cart' ) ) {
return;
@ -87,6 +87,12 @@ class WC_Discounts {
$this->object = $cart;
if ( 'excl' === $cart->tax_display_cart ) {
$this->subtotal = wc_add_number_precision_deep( $cart->get_subtotal() );
} else {
$this->subtotal = wc_add_number_precision_deep( $cart->get_subtotal() + $cart->get_subtotal_tax() );
}
foreach ( $cart->get_cart() as $key => $cart_item ) {
$item = new stdClass();
$item->key = $key;
@ -95,9 +101,6 @@ class WC_Discounts {
$item->quantity = $cart_item['quantity'];
$item->price = wc_add_number_precision_deep( $item->product->get_price() ) * $item->quantity;
$this->items[ $key ] = $item;
if ( ! wc_prices_include_tax() ) {
$this->tax_total += wc_add_number_precision_deep( $cart_item['line_tax'] );
}
}
uasort( $this->items, array( $this, 'sort_by_price' ) );
@ -111,12 +114,14 @@ class WC_Discounts {
*/
public function set_items_from_order( $order ) {
$this->items = $this->discounts = array();
$this->subtotal = 0;
if ( ! is_a( $order, 'WC_Order' ) ) {
return;
}
$this->object = $order;
$this->subtotal = wc_add_number_precision_deep( $order->get_subtotal() );
foreach ( $order->get_items() as $order_item ) {
$item = new stdClass();
@ -622,7 +627,8 @@ class WC_Discounts {
* @return bool
*/
protected function validate_coupon_minimum_amount( $coupon ) {
$subtotal = wc_remove_number_precision( array_sum( wp_list_pluck( $this->items, 'price' ) ) + $this->tax_total );
$subtotal = wc_remove_number_precision_deep( $this->subtotal );
if ( $coupon->get_minimum_amount() > 0 && apply_filters( 'woocommerce_coupon_validate_minimum_amount', $coupon->get_minimum_amount() > $subtotal, $coupon, $subtotal ) ) {
/* translators: %s: coupon minimum amount */
throw new Exception( sprintf( __( 'The minimum spend for this coupon is %s.', 'woocommerce' ), wc_price( $coupon->get_minimum_amount() ) ), 108 );
@ -640,7 +646,7 @@ class WC_Discounts {
* @return bool
*/
protected function validate_coupon_maximum_amount( $coupon ) {
$subtotal = wc_remove_number_precision( array_sum( wp_list_pluck( $this->items, 'price' ) ) + $this->tax_total );
$subtotal = wc_remove_number_precision_deep( $this->subtotal );
if ( $coupon->get_maximum_amount() > 0 && apply_filters( 'woocommerce_coupon_validate_maximum_amount', $coupon->get_maximum_amount() < $subtotal, $coupon ) ) {
/* translators: %s: coupon maximum amount */