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

Use new helper functions in api classes

This commit is contained in:
Mike Jolley 2019-03-20 14:21:39 +00:00
parent e900fa3b1e
commit 18266a6eb8
2 changed files with 18 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
includes/api/legacy/v3/class-wc-api-taxes.php
View File

@ -575,38 +575,19 @@ class WC_API_Taxes extends WC_API_Resource {
throw new WC_API_Exception( 'woocommerce_api_missing_tax_class_name', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'name' ), 400 ); throw new WC_API_Exception( 'woocommerce_api_missing_tax_class_name', sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'name' ), 400 );
} }
$name = sanitize_text_field( $data['name'] ); $name = sanitize_text_field( $data['name'] );
$slug = sanitize_title( $name ); $tax_class = WC_Tax::create_tax_class( $name );
$classes = WC_Tax::get_tax_classes();
$exists = false;
// Check if class exists. if ( is_wp_error( $tax_class ) ) {
foreach ( $classes as $key => $class ) { return new WP_Error( 'woocommerce_api_' . $tax_class->get_error_code(), $tax_class->get_error_message(), 401 );
if ( sanitize_title( $class ) === $slug ) {
$exists = true;
break;
}
} }
// Return error if tax class already exists. do_action( 'woocommerce_api_create_tax_class', $tax_class['slug'], $data );
if ( $exists ) {
throw new WC_API_Exception( 'woocommerce_api_cannot_create_tax_class', __( 'Tax class already exists', 'woocommerce' ), 401 );
}
// Add the new class.
$classes[] = $name;
update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
do_action( 'woocommerce_api_create_tax_class', $slug, $data );
$this->server->send_status( 201 ); $this->server->send_status( 201 );
return array( return array(
'tax_class' => array( 'tax_class' => $tax_class,
'slug' => $slug,
'name' => $name,
),
); );
} catch ( WC_API_Exception $e ) { } catch ( WC_API_Exception $e ) {
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) ); return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
@ -631,37 +612,14 @@ class WC_API_Taxes extends WC_API_Resource {
throw new WC_API_Exception( 'woocommerce_api_user_cannot_delete_tax_class', __( 'You do not have permission to delete tax classes', 'woocommerce' ), 401 ); throw new WC_API_Exception( 'woocommerce_api_user_cannot_delete_tax_class', __( 'You do not have permission to delete tax classes', 'woocommerce' ), 401 );
} }
$slug = sanitize_title( $slug ); $slug = sanitize_title( $slug );
$classes = WC_Tax::get_tax_classes(); $tax_class = WC_Tax::get_tax_class_by( 'slug', $slug );
$deleted = false; $deleted = WC_Tax::delete_tax_class_by( 'slug', $slug );
foreach ( $classes as $key => $class ) { if ( is_wp_error( $deleted ) || ! $deleted ) {
if ( sanitize_title( $class ) === $slug ) {
unset( $classes[ $key ] );
$deleted = true;
break;
}
}
if ( ! $deleted ) {
throw new WC_API_Exception( 'woocommerce_api_cannot_delete_tax_class', __( 'Could not delete the tax class', 'woocommerce' ), 401 ); throw new WC_API_Exception( 'woocommerce_api_cannot_delete_tax_class', __( 'Could not delete the tax class', 'woocommerce' ), 401 );
} }
update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
// Delete tax rate locations locations from the selected class.
$wpdb->query( $wpdb->prepare( "
DELETE locations.*
FROM {$wpdb->prefix}woocommerce_tax_rate_locations AS locations
INNER JOIN
{$wpdb->prefix}woocommerce_tax_rates AS rates
ON rates.tax_rate_id = locations.tax_rate_id
WHERE rates.tax_rate_class = '%s'
", $slug ) );
// Delete tax rates in the selected class.
$wpdb->delete( $wpdb->prefix . 'woocommerce_tax_rates', array( 'tax_rate_class' => $slug ), array( '%s' ) );
return array( 'message' => sprintf( __( 'Deleted %s', 'woocommerce' ), 'tax_class' ) ); return array( 'message' => sprintf( __( 'Deleted %s', 'woocommerce' ), 'tax_class' ) );
} catch ( WC_API_Exception $e ) { } catch ( WC_API_Exception $e ) {
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) ); return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );

59
includes/api/v1/class-wc-rest-tax-classes-controller.php
View File

@ -158,37 +158,18 @@ class WC_REST_Tax_Classes_V1_Controller extends WC_REST_Controller {
} }
/** /**
* Create a single tax. * Create a single tax class.
* *
* @param WP_REST_Request $request Full details about the request. * @param WP_REST_Request $request Full details about the request.
* @return WP_Error|WP_REST_Response * @return WP_Error|WP_REST_Response
*/ */
public function create_item( $request ) { public function create_item( $request ) {
$exists = false; $tax_class = WC_Tax::create_tax_class( $request['name'] );
$classes = WC_Tax::get_tax_classes();
$tax_class = array(
'slug' => sanitize_title( $request['name'] ),
'name' => $request['name'],
);
// Check if class exists. if ( is_wp_error( $tax_class ) ) {
foreach ( $classes as $key => $class ) { return new WP_Error( 'woocommerce_rest_' . $tax_class->get_error_code(), $tax_class->get_error_message(), array( 'status' => 400 ) );
if ( sanitize_title( $class ) === $tax_class['slug'] ) {
$exists = true;
break;
}
} }
// Return error if tax class already exists.
if ( $exists ) {
return new WP_Error( 'woocommerce_rest_tax_class_exists', __( 'Cannot create existing resource.', 'woocommerce' ), array( 'status' => 400 ) );
}
// Add the new class.
$classes[] = $tax_class['name'];
update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
$this->update_additional_fields_for_object( $tax_class, $request ); $this->update_additional_fields_for_object( $tax_class, $request );
/** /**
@ -225,41 +206,17 @@ class WC_REST_Tax_Classes_V1_Controller extends WC_REST_Controller {
return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Taxes do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) ); return new WP_Error( 'woocommerce_rest_trash_not_supported', __( 'Taxes do not support trashing.', 'woocommerce' ), array( 'status' => 501 ) );
} }
$tax_class = array( $tax_class = WC_Tax::get_tax_class_by( 'slug', sanitize_title( $request['slug'] ) );
'slug' => sanitize_title( $request['slug'] ), $deleted = WC_Tax::delete_tax_class_by( 'slug', sanitize_title( $request['slug'] ) );
'name' => '',
);
$classes = WC_Tax::get_tax_classes();
$deleted = false;
foreach ( $classes as $key => $class ) { if ( is_wp_error( $deleted ) ) {
if ( sanitize_title( $class ) === $tax_class['slug'] ) { return new WP_Error( 'woocommerce_rest_' . $deleted->get_error_code(), $deleted->get_error_message(), array( 'status' => 400 ) );
$tax_class['name'] = $class;
unset( $classes[ $key ] );
$deleted = true;
break;
}
} }
if ( ! $deleted ) { if ( ! $deleted ) {
return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource id.', 'woocommerce' ), array( 'status' => 400 ) ); return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource id.', 'woocommerce' ), array( 'status' => 400 ) );
} }
update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
// Delete tax rate locations locations from the selected class.
$wpdb->query( $wpdb->prepare( "
DELETE locations.*
FROM {$wpdb->prefix}woocommerce_tax_rate_locations AS locations
INNER JOIN
{$wpdb->prefix}woocommerce_tax_rates AS rates
ON rates.tax_rate_id = locations.tax_rate_id
WHERE rates.tax_rate_class = '%s'
", $tax_class['slug'] ) );
// Delete tax rates in the selected class.
$wpdb->delete( $wpdb->prefix . 'woocommerce_tax_rates', array( 'tax_rate_class' => $tax_class['slug'] ), array( '%s' ) );
$request->set_param( 'context', 'edit' ); $request->set_param( 'context', 'edit' );
$response = $this->prepare_item_for_response( $tax_class, $request ); $response = $this->prepare_item_for_response( $tax_class, $request );