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

Merge pull request #17628 from woocommerce/fix/17624 

Change how line items are saved in API
This commit is contained in:
Claudio Sanches 2017-11-09 17:36:39 -02:00 committed by GitHub
parent a574401ddc 0198aa22ac
commit b04c7bd71e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/abstracts/abstract-wc-order.php
View File

@ -842,17 +842,17 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
/**
* Remove item from the order.
*
* @param int $item_id
* @param int $item_id Item ID to delete.
* @return false|void
*/
public function remove_item( $item_id ) {
$item = $this->get_item( $item_id );
$item = $this->get_item( $item_id, false );
if ( ! $item || ! ( $items_key = $this->get_items_key( $item ) ) ) {
return false;
}
// Unset and remove later
// Unset and remove later.
$this->items_to_delete[] = $item;
unset( $this->items[ $items_key ][ $item->get_id() ] );
}

60
includes/api/class-wc-rest-orders-controller.php
View File

@ -606,14 +606,14 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
/**
* Create or update a line item.
*
* @param array $posted Line item data.
* @param array $posted Line item data.
* @param string $action 'create' to add line item or 'update' to update it.
*
* @param object $item Passed when updating an item. Null during creation.
* @return WC_Order_Item_Product
* @throws WC_REST_Exception Invalid data, server error.
*/
protected function prepare_line_items( $posted, $action = 'create' ) {
$item = new WC_Order_Item_Product( ! empty( $posted['id'] ) ? $posted['id'] : '' );
protected function prepare_line_items( $posted, $action = 'create', $item = null ) {
$item = is_null( $item ) ? new WC_Order_Item_Product( ! empty( $posted['id'] ) ? $posted['id'] : '' ) : $item;
$product = wc_get_product( $this->get_product_id( $posted ) );
if ( $product !== $item->get_product() ) {
@ -636,14 +636,14 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
/**
* Create or update an order shipping method.
*
* @param $posted $shipping Item data.
* @param array $posted $shipping Item data.
* @param string $action 'create' to add shipping or 'update' to update it.
*
* @param object $item Passed when updating an item. Null during creation.
* @return WC_Order_Item_Shipping
* @throws WC_REST_Exception Invalid data, server error.
*/
protected function prepare_shipping_lines( $posted, $action ) {
$item = new WC_Order_Item_Shipping( ! empty( $posted['id'] ) ? $posted['id'] : '' );
protected function prepare_shipping_lines( $posted, $action = 'create', $item = null ) {
$item = is_null( $item ) ? new WC_Order_Item_Shipping( ! empty( $posted['id'] ) ? $posted['id'] : '' ) : $item;
if ( 'create' === $action ) {
if ( empty( $posted['method_id'] ) ) {
@ -660,14 +660,14 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
/**
* Create or update an order fee.
*
* @param array $posted Item data.
* @param array $posted Item data.
* @param string $action 'create' to add fee or 'update' to update it.
*
* @param object $item Passed when updating an item. Null during creation.
* @return WC_Order_Item_Fee
* @throws WC_REST_Exception Invalid data, server error.
*/
protected function prepare_fee_lines( $posted, $action ) {
$item = new WC_Order_Item_Fee( ! empty( $posted['id'] ) ? $posted['id'] : '' );
protected function prepare_fee_lines( $posted, $action = 'create', $item = null ) {
$item = is_null( $item ) ? new WC_Order_Item_Fee( ! empty( $posted['id'] ) ? $posted['id'] : '' ) : $item;
if ( 'create' === $action ) {
if ( empty( $posted['name'] ) ) {
@ -684,14 +684,14 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
/**
* Create or update an order coupon.
*
* @param array $posted Item data.
* @param array $posted Item data.
* @param string $action 'create' to add coupon or 'update' to update it.
*
* @param object $item Passed when updating an item. Null during creation.
* @return WC_Order_Item_Coupon
* @throws WC_REST_Exception Invalid data, server error.
*/
protected function prepare_coupon_lines( $posted, $action ) {
$item = new WC_Order_Item_Coupon( ! empty( $posted['id'] ) ? $posted['id'] : '' );
protected function prepare_coupon_lines( $posted, $action = 'create', $item = null ) {
$item = is_null( $item ) ? new WC_Order_Item_Coupon( ! empty( $posted['id'] ) ? $posted['id'] : '' ) : $item;
if ( 'create' === $action ) {
if ( empty( $posted['code'] ) ) {
@ -710,10 +710,10 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
* When updating, the item ID provided is checked to ensure it is associated
* with the order.
*
* @param WC_Order $order order
* @param string $item_type
* @param array $posted item provided in the request body
* @throws WC_REST_Exception If item ID is not associated with order
* @param WC_Order $order order object.
* @param string $item_type The item type.
* @param array $posted item provided in the request body.
* @throws WC_REST_Exception If item ID is not associated with order.
*/
protected function set_item( $order, $item_type, $posted ) {
global $wpdb;
@ -725,29 +725,23 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
}
$method = 'prepare_' . $item_type;
$item = null;
// Verify provided line item ID is associated with order.
if ( 'update' === $action ) {
$result = $wpdb->get_row(
$wpdb->prepare( "SELECT * FROM {$wpdb->prefix}woocommerce_order_items WHERE order_item_id = %d AND order_id = %d",
absint( $posted['id'] ),
absint( $order->get_id() )
) );
if ( is_null( $result ) ) {
$item = $order->get_item( absint( $posted['id'] ), false );
if ( ! $item ) {
throw new WC_REST_Exception( 'woocommerce_rest_invalid_item_id', __( 'Order item ID provided is not associated with order.', 'woocommerce' ), 400 );
}
}
// Prepare item data
$item = $this->$method( $posted, $action );
// Prepare item data.
$item = $this->$method( $posted, $action, $item );
/**
* Action hook to adjust item before save.
* @since 3.0.0
*/
do_action( 'woocommerce_rest_set_order_item', $item, $posted );
// Save or add to order
// If creating the order, add the item to it.
if ( 'create' === $action ) {
$order->add_item( $item );
} else {

1
includes/data-stores/abstract-wc-order-item-type-data-store.php
View File

@ -91,6 +91,7 @@ abstract class Abstract_WC_Order_Item_Type_Data_Store extends WC_Data_Store_WP i
$wpdb->delete( $wpdb->prefix . 'woocommerce_order_items', array( 'order_item_id' => $item->get_id() ) );
$wpdb->delete( $wpdb->prefix . 'woocommerce_order_itemmeta', array( 'order_item_id' => $item->get_id() ) );
do_action( 'woocommerce_delete_order_item', $item->get_id() );
$this->clear_cache( $item );
}
}

44
tests/unit-tests/order/crud.php
View File

@ -1701,4 +1701,48 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
$coupon->delete( true );
$order->delete( true );
}
/**
* Test removing and adding items + recalculation.
*
* @since 3.2.0
*/
function test_add_remove_items() {
$product = WC_Helper_Product::create_simple_product();
$object = new WC_Order();
$item_1 = new WC_Order_Item_Product();
$item_1->set_props( array(
'product' => $product,
'quantity' => 4,
'total' => 100,
) );
$item_1_id = $item_1->save();
$item_2 = new WC_Order_Item_Product();
$item_2->set_props( array(
'product' => $product,
'quantity' => 2,
'total' => 100,
) );
$item_2_id = $item_2->save();
$object->add_item( $item_1 );
$object->add_item( $item_2 );
$object->save();
$object->calculate_totals();
$this->assertEquals( 200, $object->get_total() );
// remove an item and add an item, then compare totals.
$object->remove_item( $item_1_id );
$item_3 = new WC_Order_Item_Product();
$item_3->set_props( array(
'product' => $product,
'quantity' => 1,
'total' => 100,
) );
$object->add_item( $item_3 );
$object->save();
$object->calculate_totals();
$this->assertEquals( 200, $object->get_total() );
}
}