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

Remove duplicate coupon type check

This commit is contained in:
Gerhard 2014-03-06 10:08:27 +02:00
parent 3b0c541acf
commit 0463516020
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
includes/api/class-wc-api-coupons.php
View File

@ -201,11 +201,6 @@ class WC_API_Coupons extends WC_API_Resource {
return new WP_Error( 'woocommerce_api_missing_coupon_code', sprintf( __( 'Missing parameter %s' ), 'code' ), array( 'status' => 400 ) ); return new WP_Error( 'woocommerce_api_missing_coupon_code', sprintf( __( 'Missing parameter %s' ), 'code' ), array( 'status' => 400 ) );
} }
// Validate coupon types
if ( ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_coupon_types() ) ) ) {
return new WP_Error( 'woocommerce_api_invalid_coupon_type', sprintf( __( 'Invalid coupon type - the coupon type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_coupon_types() ) ) ), array( 'status' => 400 ) );
}
$coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] ); $coupon_code = apply_filters( 'woocommerce_coupon_code', $data['code'] );
// Check for duplicate coupon codes // Check for duplicate coupon codes
@ -243,8 +238,9 @@ class WC_API_Coupons extends WC_API_Resource {
$coupon_data = wp_parse_args( $data, $defaults ); $coupon_data = wp_parse_args( $data, $defaults );
if ( ! in_array( $coupon_data['type'], array_keys( wc_get_coupon_types() ) ) ) { // Validate coupon types
return new WP_Error( 'woocommerce_api_invalid_coupon_type', __( 'Invalid coupon type', 'woocommerce'), array( 'status' => 400 ) ); if ( ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_coupon_types() ) ) ) {
return new WP_Error( 'woocommerce_api_invalid_coupon_type', sprintf( __( 'Invalid coupon type - the coupon type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_coupon_types() ) ) ), array( 'status' => 400 ) );
} }
$new_coupon = array( $new_coupon = array(
@ -329,8 +325,9 @@ class WC_API_Coupons extends WC_API_Resource {
} }
if ( isset( $data['type'] ) ) { if ( isset( $data['type'] ) ) {
if ( ! in_array( $data['type'], array_keys( wc_get_coupon_types() ) ) ) { // Validate coupon types
return new WP_Error( 'woocommerce_api_invalid_coupon_type', __( 'Invalid coupon type', 'woocommerce'), array( 'status' => 400 ) ); if ( ! in_array( wc_clean( $data['type'] ), array_keys( wc_get_coupon_types() ) ) ) {
return new WP_Error( 'woocommerce_api_invalid_coupon_type', sprintf( __( 'Invalid coupon type - the coupon type must be any of these: %s', 'woocommerce' ), implode( ', ', array_keys( wc_get_coupon_types() ) ) ), array( 'status' => 400 ) );
} }
update_post_meta( $id, 'discount_type', $data['type'] ); update_post_meta( $id, 'discount_type', $data['type'] );
} }