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

Fix conflict

This commit is contained in:
Mike Jolley 2015-04-14 11:27:30 +01:00
parent 38f8c5fd0b 4d0e0b71f3
commit d133d35e27
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/api/class-wc-api-orders.php
View File

@ -372,6 +372,11 @@ class WC_API_Orders extends WC_API_Resource {
* @return array * @return array
*/ */
public function create_order( $data ) { public function create_order( $data ) {
global $wpdb;
$data = isset( $data['order'] ) ? $data['order'] : array();
$wpdb->query( 'START TRANSACTION' );
try { try {
if ( ! isset( $data['order'] ) ) { if ( ! isset( $data['order'] ) ) {
@ -482,10 +487,14 @@ class WC_API_Orders extends WC_API_Resource {
do_action( 'woocommerce_api_create_order', $order->id, $data, $this ); do_action( 'woocommerce_api_create_order', $order->id, $data, $this );
$wpdb->query( 'COMMIT' );
return $this->get_order( $order->id ); return $this->get_order( $order->id );
} catch ( WC_API_Exception $e ) { } catch ( WC_API_Exception $e ) {
$wpdb->query( 'ROLLBACK' );
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) ); return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
} }
} }