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

To prevent discounts being applied in 'random' order (based on order added to cart), sort cart items based on subtotal during calculate_totals. 

Closes #8987

@claudiosmweb @georgestephanis does this change look sane to you folks?
This commit is contained in:
Mike Jolley 2015-09-01 13:16:55 +01:00
parent 6728f5c1fe
commit 91ac7fc974
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
includes/class-wc-cart.php
View File

@ -1054,6 +1054,21 @@ class WC_Cart {
do_action( 'woocommerce_cart_reset', $this, $unset_session );
}
/**
* Sort by subtotal
* @param array $a
* @param array $b
* @return int
*/
private function sort_by_subtotal( $a, $b ) {
$first_item_subtotal = isset( $a['line_subtotal'] ) ? $a['line_subtotal'] : 0;
$second_item_subtotal = isset( $b['line_subtotal'] ) ? $b['line_subtotal'] : 0;
if ( $first_item_subtotal === $second_item_subtotal ) {
return 0;
}
return ( $first_item_subtotal < $second_item_subtotal ) ? 1 : -1;
}
/**
* Calculate totals for the items in the cart.
*/
@ -1070,11 +1085,12 @@ class WC_Cart {
$tax_rates = array();
$shop_tax_rates = array();
$cart = $this->get_cart();
/**
* Calculate subtotals for items. This is done first so that discount logic can use the values.
*/
foreach ( $this->get_cart() as $cart_item_key => $values ) {
foreach ( $cart as $cart_item_key => $values ) {
$_product = $values['data'];
@ -1176,10 +1192,13 @@ class WC_Cart {
$this->subtotal_ex_tax += $line_subtotal;
}
// Order cart items by price so coupon logic is 'fair' for customers and not based on order added to cart.
uasort( $cart, array( $this, 'sort_by_subtotal' ) );
/**
* Calculate totals for items
*/
foreach ( $this->get_cart() as $cart_item_key => $values ) {
foreach ( $cart as $cart_item_key => $values ) {
$_product = $values['data'];

1
readme.txt
View File

@ -159,6 +159,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
== Changelog ==
* Fix - To prevent discounts being applied in 'random' order (based on order added to cart), sort cart items based on subtotal during calculate_totals.
* Fix - Removed extra ob_start() in class-wc-shortcodes.php.
* Fix - Show counts in category dropdown.
* Tweak - Renamed wc_var_prices transient to allow them to flush on product save.