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

Made coupon valid check more readable

This commit is contained in:
Mike Jolley 2016-06-27 14:59:50 +01:00
parent 931660038a
commit 8a46831eb1
1 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,30 +455,6 @@ class WC_Coupon {
} }
} }
/**
* Ensure coupon is valid for product categories in the cart is valid or throw exception.
*
* @throws Exception
*/
private function validate_excluded_product_categories() {
if ( sizeof( $this->exclude_product_categories ) > 0 ) {
$valid_for_cart = false;
if ( ! WC()->cart->is_empty() ) {
foreach( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
$product_cats = wc_get_product_cat_ids( $cart_item['product_id'] );
// If we find an item with a cat NOT in our disallowed cat list, the coupon is valid
if ( empty( $product_cats ) || sizeof( array_diff( $product_cats, $this->exclude_product_categories ) ) > 0 ) {
$valid_for_cart = true;
}
}
}
if ( ! $valid_for_cart ) {
throw new Exception( self::E_WC_COUPON_NOT_APPLICABLE );
}
}
}
/** /**
* Ensure coupon is valid for sale items in the cart is valid or throw exception. * Ensure coupon is valid for sale items in the cart is valid or throw exception.
* *
@ -605,7 +581,6 @@ class WC_Coupon {
$this->validate_maximum_amount(); $this->validate_maximum_amount();
$this->validate_product_ids(); $this->validate_product_ids();
$this->validate_product_categories(); $this->validate_product_categories();
$this->validate_excluded_product_categories();
$this->validate_sale_items(); $this->validate_sale_items();
$this->validate_cart_excluded_items(); $this->validate_cart_excluded_items();
@ -642,42 +617,35 @@ class WC_Coupon {
$valid = false; $valid = false;
$product_cats = wc_get_product_cat_ids( $product->id ); $product_cats = wc_get_product_cat_ids( $product->id );
$product_ids = array( $product->id, ( isset( $product->variation_id ) ? $product->variation_id : 0 ), $product->get_parent() );
// Specific products get the discount // Specific products get the discount
if ( sizeof( $this->product_ids ) > 0 ) { if ( sizeof( $this->product_ids ) && sizeof( array_intersect( $product_ids, $this->product_ids ) ) ) {
if ( in_array( $product->id, $this->product_ids ) || ( isset( $product->variation_id ) && in_array( $product->variation_id, $this->product_ids ) ) || in_array( $product->get_parent(), $this->product_ids ) ) { $valid = true;
$valid = true;
}
} }
// Category discounts // Category discounts
if ( sizeof( $this->product_categories ) > 0 ) { if ( sizeof( $this->product_categories ) && sizeof( array_intersect( $product_cats, $this->product_categories ) ) ) {
if ( sizeof( array_intersect( $product_cats, $this->product_categories ) ) > 0 ) { $valid = true;
$valid = true;
}
} }
// No product ids - all items discounted
if ( ! sizeof( $this->product_ids ) && ! sizeof( $this->product_categories ) ) { if ( ! sizeof( $this->product_ids ) && ! sizeof( $this->product_categories ) ) {
// No product ids - all items discounted
$valid = true; $valid = true;
} }
// Specific product ID's excluded from the discount // Specific product ID's excluded from the discount
if ( sizeof( $this->exclude_product_ids ) > 0 ) { if ( sizeof( $this->exclude_product_ids ) && sizeof( array_intersect( $product_ids, $this->product_ids ) ) ) {
if ( in_array( $product->id, $this->exclude_product_ids ) || ( isset( $product->variation_id ) && in_array( $product->variation_id, $this->exclude_product_ids ) ) || in_array( $product->get_parent(), $this->exclude_product_ids ) ) { $valid = false;
$valid = false;
}
} }
// Specific categories excluded from the discount // Specific categories excluded from the discount
if ( sizeof( $this->exclude_product_categories ) > 0 ) { if ( sizeof( $this->exclude_product_categories ) && sizeof( array_intersect( $product_cats, $this->exclude_product_categories ) ) ) {
if ( sizeof( array_intersect( $product_cats, $this->exclude_product_categories ) ) > 0 ) { $valid = false;
$valid = false;
}
} }
// Sale Items excluded from discount // Sale Items excluded from discount
if ( $this->exclude_sale_items == 'yes' ) { if ( 'yes' === $this->exclude_sale_items ) {
$product_ids_on_sale = wc_get_product_ids_on_sale(); $product_ids_on_sale = wc_get_product_ids_on_sale();
if ( isset( $product->variation_id ) ) { if ( isset( $product->variation_id ) ) {