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

Revert to original behavior

This commit is contained in:
Claudiu Lodromanean 2017-03-07 13:17:36 -08:00
parent 955a75bf30
commit d0f47a7980
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1736,21 +1736,6 @@ class WC_Cart {
return false;
}
// Check to see if an individual use coupon is set
if ( $this->applied_coupons ) {
foreach ( $this->applied_coupons as $code ) {
$coupon = new WC_Coupon( $code );
if ( $coupon->get_individual_use() && false === apply_filters( 'woocommerce_apply_with_individual_use_coupon', false, $the_coupon, $coupon, $this->applied_coupons ) ) {
// Reject new coupon
$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_ALREADY_APPLIED_INDIV_USE_ONLY );
return false;
}
}
}
// If its individual use then remove other coupons
if ( $the_coupon->get_individual_use() ) {
$coupons_to_keep = apply_filters( 'woocommerce_apply_individual_use_coupon', array(), $the_coupon, $this->applied_coupons );
@ -1769,6 +1754,21 @@ class WC_Cart {
}
}
// Check to see if an individual use coupon is set
if ( $this->applied_coupons ) {
foreach ( $this->applied_coupons as $code ) {
$coupon = new WC_Coupon( $code );
if ( $coupon->get_individual_use() && false === apply_filters( 'woocommerce_apply_with_individual_use_coupon', false, $the_coupon, $coupon, $this->applied_coupons ) ) {
// Reject new coupon
$coupon->add_coupon_message( WC_Coupon::E_WC_COUPON_ALREADY_APPLIED_INDIV_USE_ONLY );
return false;
}
}
}
$this->applied_coupons[] = $coupon_code;
// Choose free shipping

2
tests/unit-tests/cart/cart.php
View File

@ -645,7 +645,7 @@ class WC_Tests_Cart extends WC_Unit_Test_Case {
$coupons = WC()->cart->get_coupons();
$this->assertEquals( count( $coupons ), 1 );
$this->assertEquals( 'code1', reset( $coupons )->get_code() );
$this->assertEquals( 'code2', reset( $coupons )->get_code() );
// Clean up
WC()->cart->empty_cart();