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

[REST API] Check if tax exists before try to update 

@mikejolley
This commit is contained in:
Claudio Sanches 2016-05-05 13:56:32 -03:00
parent 8fa6733a04
commit 1a1c336468
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/api/class-wc-rest-taxes-controller.php
View File

@ -265,11 +265,11 @@ class WC_REST_Taxes_Controller extends WP_REST_Controller {
*
* @todo Replace with CRUD in 2.7.0
* @param WP_REST_Request $request Full details about the request.
* @param stdClass|null $current Existing tax object.
* @return stdClass
*/
protected function create_or_update_tax( $request ) {
protected function create_or_update_tax( $request, $current = null ) {
$id = absint( isset( $request['id'] ) ? $request['id'] : 0 );
$current_tax = $id ? WC_Tax::_get_tax_rate( $id, OBJECT ) : false;
$data = array();
$fields = array(
'tax_rate_country',
@ -293,7 +293,7 @@ class WC_REST_Taxes_Controller extends WP_REST_Controller {
}
// Test new data against current data.
if ( $current_tax && $current_tax->$field === $request[ $key ] ) {
if ( $current && $current->$field === $request[ $key ] ) {
continue;
}
@ -391,7 +391,13 @@ class WC_REST_Taxes_Controller extends WP_REST_Controller {
* @return WP_Error|WP_REST_Response
*/
public function update_item( $request ) {
$tax = $this->create_or_update_tax( $request );
$id = (int) $request['id'];
$current = WC_Tax::_get_tax_rate( $id, OBJECT );
if ( empty( $id ) || empty( $current ) ) {
return new WP_Error( 'woocommerce_rest_invalid_id', __( 'Invalid resource id.', 'woocommerce' ), array( 'status' => 404 ) );
}
$tax = $this->create_or_update_tax( $request, $current );
$this->update_additional_fields_for_object( $tax, $request );