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

Use the product object rather than function wc_get_product_ids_on_sale

This commit is contained in:
Mike Jolley 2017-06-19 11:53:26 +01:00
parent 55ca1899ad
commit b47e1ee728
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -881,16 +881,13 @@ class WC_Coupon extends WC_Legacy_Coupon {
*/
private function validate_sale_items() {
if ( $this->get_exclude_sale_items() ) {
$valid_for_cart = false;
$product_ids_on_sale = wc_get_product_ids_on_sale();
$valid_for_cart = false;
if ( ! WC()->cart->is_empty() ) {
foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
if ( ! empty( $cart_item['variation_id'] ) ) {
if ( ! in_array( $cart_item['variation_id'], $product_ids_on_sale, true ) ) {
$valid_for_cart = true;
}
} elseif ( ! in_array( $cart_item['product_id'], $product_ids_on_sale, true ) ) {
$product = $cart_item['data'];
if ( ! $product->is_on_sale() ) {
$valid_for_cart = true;
}
}
@ -1058,12 +1055,8 @@ class WC_Coupon extends WC_Legacy_Coupon {
}
// Sale Items excluded from discount
if ( $this->get_exclude_sale_items() ) {
$product_ids_on_sale = wc_get_product_ids_on_sale();
if ( in_array( $product->get_id(), $product_ids_on_sale, true ) ) {
$valid = false;
}
if ( $this->get_exclude_sale_items() && $product->is_on_sale() ) {
$valid = false;
}
return apply_filters( 'woocommerce_coupon_is_valid_for_product', $valid, $product, $this, $values );