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

Add ability to filter 'coupon code'

This commit is contained in:
Ken Bass 2013-02-14 19:29:55 -05:00
parent b9b8a1480b
commit b0a5402f11
4 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/class-wc-cart.php
View File

@ -343,7 +343,7 @@ class WC_Cart {
if ( is_wp_error( $coupon->is_valid() ) ) {
$woocommerce->add_error( sprintf( __( 'Sorry, it seems the coupon "%s" is invalid - it has now been removed from your order.', 'woocommerce' ), $code ) );
$woocommerce->add_error( sprintf( __( 'Sorry, it seems the %s "%s" is invalid - it has now been removed from your order.', 'woocommerce' ), $coupon->coupon_text, $code ) );
// Remove the coupon
unset( $this->applied_coupons[ $key ] );
@ -420,7 +420,7 @@ class WC_Cart {
$check_emails = array_map( 'sanitize_email', array_map( 'strtolower', $check_emails ) );
if ( 0 == sizeof( array_intersect( $check_emails, $coupon->customer_email ) ) ) {
$woocommerce->add_error( sprintf( __( 'Sorry, it seems the coupon "%s" is not yours - it has now been removed from your order.', 'woocommerce' ), $code ) );
$woocommerce->add_error( sprintf( __( 'Sorry, it seems the %s "%s" is not yours - it has now been removed from your order.', 'woocommerce' ), $coupon->coupon_text, $code ) );
// Remove the coupon
unset( $this->applied_coupons[ $key ] );
@ -1767,7 +1767,7 @@ class WC_Cart {
// Check if applied
if ( $woocommerce->cart->has_discount( $coupon_code ) ) {
$woocommerce->add_error( __( 'Coupon code already applied!', 'woocommerce' ) );
$woocommerce->add_error( sprintf( __( '%s already applied!', 'woocommerce' ), ucfirst( $the_coupon->coupon_text ) ) );
return false;
}
@ -1784,7 +1784,7 @@ class WC_Cart {
if ( $existing_coupon->individual_use == 'yes' && false === apply_filters( 'woocommerce_apply_with_individual_use_coupon', false, $the_coupon, $existing_coupon, $this->applied_coupons ) ) {
// Reject new coupon
$woocommerce->add_message( sprintf( __( 'Sorry, coupon <code>%s</code> has already been applied and cannot be used in conjunction with other coupons.', 'woocommerce' ), $code ) );
$woocommerce->add_error( sprintf( __( 'Sorry, %s <code>%s</code> has already been applied and cannot be used in conjunction with other coupons.', 'woocommerce' ), $existing_coupon->coupon_text, $code ) );
return false;
}
@ -1800,14 +1800,14 @@ class WC_Cart {
$this->calculate_totals();
$woocommerce->add_message( __( 'Coupon code applied successfully.', 'woocommerce' ) );
$woocommerce->add_message( sprintf( __( '%s applied successfully.', 'woocommerce' ), ucfirst( $the_coupon->coupon_text ) ) );
do_action( 'woocommerce_applied_coupon', $coupon_code );
return true;
} else {
$woocommerce->add_error( __( 'Coupon does not exist!', 'woocommerce' ) );
} else {
$woocommerce->add_error( sprintf( __( '%s does not exist!', 'woocommerce' ), ucfirst( $the_coupon->coupon_text ) ) );
return false;
}
return false;

48
classes/class-wc-coupon.php
View File

@ -70,6 +70,9 @@ class WC_Coupon {
/** @public string Error message. */
public $error_message;
/** @public string Filterable text used on frontend - defaults to 'coupon code'. */
public $coupon_text;
/**
* Coupon constructor. Loads coupon data.
@ -110,8 +113,11 @@ class WC_Coupon {
$coupon_id = $wpdb->get_var( $wpdb->prepare( apply_filters( 'woocommerce_coupon_code_query', "SELECT ID FROM $wpdb->posts WHERE post_title = %s AND post_type = 'shop_coupon'" ), $this->code ) );
if ( ! $coupon_id )
if ( ! $coupon_id ) {
// Handle the case where coupon does not exist. Filter can decode whether to call it something generic or more specific
$this->coupon_text = apply_filters( 'woocommerce_coupon_text', __( 'coupon code', 'woocommerce' ), $this );
return;
}
$coupon = get_post( $coupon_id );
$coupon->post_title = apply_filters( 'woocommerce_coupon_code', $coupon->post_title );
@ -155,6 +161,9 @@ class WC_Coupon {
$this->exclude_product_categories = array_filter( array_map( 'trim', (array) maybe_unserialize( $this->exclude_product_categories ) ) );
$this->customer_email = array_filter( array_map( 'trim', array_map( 'strtolower', (array) maybe_unserialize( $this->customer_email ) ) ) );
}
$this->coupon_text = apply_filters( 'woocommerce_coupon_text', __( 'coupon code', 'woocommerce' ), $this );
}
@ -245,7 +254,7 @@ class WC_Coupon {
if ( $this->usage_limit > 0 ) {
if ( $this->usage_count >= $this->usage_limit ) {
$valid = false;
$error = __( 'Coupon usage limit has been reached.', 'woocommerce' );
$error = sprintf( __( '%s usage limit has been reached.', 'woocommerce' ), ucfirst( $this->coupon_text ) );
}
}
@ -253,15 +262,15 @@ class WC_Coupon {
if ( $this->expiry_date ) {
if ( current_time( 'timestamp' ) > $this->expiry_date ) {
$valid = false;
$error = __( 'This coupon has expired.', 'woocommerce' );
$error = sprintf( __( 'This %s has expired.', 'woocommerce' ), $this->coupon_text );
}
}
// Minimum spend
if ( $this->minimum_amount > 0 ) {
if ( $this->minimum_amount > $woocommerce->cart->subtotal ) {
$valid = false;
$error = sprintf( __( 'The minimum spend for this coupon is %s.', 'woocommerce' ), woocommerce_price( $this->minimum_amount ) );
$valid = false;
$error = sprintf( __( 'The minimum spend for this %s is %s.', 'woocommerce' ), $this->coupon_text, woocommerce_price( $this->minimum_amount ) );
}
}
@ -277,7 +286,7 @@ class WC_Coupon {
}
if ( ! $valid_for_cart ) {
$valid = false;
$error = __( 'Sorry, this coupon is not applicable to your cart contents.', 'woocommerce' );
$error = sprintf( __( 'Sorry, this %s is not applicable to your cart contents.', 'woocommerce' ), $this->coupon_text );
}
}
@ -295,7 +304,7 @@ class WC_Coupon {
}
if ( ! $valid_for_cart ) {
$valid = false;
$error = __( 'Sorry, this coupon is not applicable to your cart contents.', 'woocommerce' );
$error = sprintf( __( 'Sorry, this %s is not applicable to your cart contents.', 'woocommerce' ), $this->coupon_text );
}
}
@ -314,7 +323,7 @@ class WC_Coupon {
}
if ( ! $valid_for_cart ) {
$valid = false;
$error = __( 'Sorry, this coupon is not applicable to your cart contents.', 'woocommerce' );
$error = sprintf( __( 'Sorry, this %s is not applicable to your cart contents.', 'woocommerce' ), $this->coupon_text );
}
}
@ -331,7 +340,7 @@ class WC_Coupon {
}
if ( ! $valid_for_cart ) {
$valid = false;
$error = __( 'Sorry, this coupon is not valid for sale items.', 'woocommerce' );
$error = sprintf( __( 'Sorry, this %s is not valid for sale items.', 'woocommerce' ), $this->coupon_text );
}
}
@ -349,7 +358,7 @@ class WC_Coupon {
}
if ( ! $valid_for_cart ) {
$valid = false;
$error = __( 'Sorry, this coupon is not applicable to your cart contents.', 'woocommerce' );
$error = sprintf( __( 'Sorry, this %s is not applicable to your cart contents.', 'woocommerce' ), $this->coupon_text );
}
}
}
@ -359,11 +368,26 @@ class WC_Coupon {
if ( $valid )
return true;
} else {
$error = __( 'Invalid coupon', 'woocommerce' );
} else {
$error = sprintf( __( 'Invalid %s', 'woocommerce' ), self::get_generic_coupon_text() );
}
$this->error_message = apply_filters( 'woocommerce_coupon_error', $error, $this );
return false;
}
/**
* get_generic_coupon_text static function.
*
* Return generic coupon text string for when there is no coupon instance to be used in
* text strings such as error messages.
*
* @access public
* @return string|Defaults to 'coupon code'
*/
public static function get_generic_coupon_text() {
// Handle the case where coupon does not exist. Filter can decode whether to call it something generic
return apply_filters( 'woocommerce_coupon_text', __( 'coupon code', 'woocommerce' ), null );
}
}

2
classes/shortcodes/class-wc-shortcode-cart.php
View File

@ -31,7 +31,7 @@ class WC_Shortcode_Cart {
if ( ! empty( $_POST['coupon_code'] ) ) {
$woocommerce->cart->add_discount( sanitize_text_field( $_POST['coupon_code'] ) );
} else {
$woocommerce->add_error( __( 'Please enter a coupon code.', 'woocommerce' ) );
$woocommerce->add_error( sprintf( __( 'Please enter a %s.', 'woocommerce' ), WC_Coupon::get_generic_coupon_text() ) );
}
// Remove Coupon Codes

2
woocommerce-ajax.php
View File

@ -131,7 +131,7 @@ function woocommerce_ajax_apply_coupon() {
if ( ! empty( $_POST['coupon_code'] ) ) {
$woocommerce->cart->add_discount( sanitize_text_field( $_POST['coupon_code'] ) );
} else {
$woocommerce->add_error( __( 'Please enter a coupon code.', 'woocommerce' ) );
$woocommerce->add_error( sprintf( __( 'Please enter a %s.', 'woocommerce' ), WC_Coupon::get_generic_coupon_text() ) );
}
$woocommerce->show_messages();