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 #16751 from woocommerce/fix/16736 

Only set some fields on new orders
This commit is contained in:
Mike Jolley 2017-09-08 10:52:04 +01:00 committed by GitHub
parent f6e8ed2090 ccade24ce5
commit 29aa854c0a
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/wc-core-functions.php
View File

@ -115,11 +115,15 @@ function wc_create_order( $args = array() ) {
$order->set_cart_hash( sanitize_text_field( $args['cart_hash'] ) ); $order->set_cart_hash( sanitize_text_field( $args['cart_hash'] ) );
} }
// Set these fields when creating a new order but not when updating an existing order.
if ( ! $args['order_id'] ) {
$order->set_currency( get_woocommerce_currency() );
$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
$order->set_customer_ip_address( WC_Geolocation::get_ip_address() );
$order->set_customer_user_agent( wc_get_user_agent() );
}
// Update other order props set automatically // Update other order props set automatically
$order->set_currency( get_woocommerce_currency() );
$order->set_prices_include_tax( 'yes' === get_option( 'woocommerce_prices_include_tax' ) );
$order->set_customer_ip_address( WC_Geolocation::get_ip_address() );
$order->set_customer_user_agent( wc_get_user_agent() );
$order->save(); $order->save();
} catch ( Exception $e ) { } catch ( Exception $e ) {
return new WP_Error( 'error', $e->getMessage() ); return new WP_Error( 'error', $e->getMessage() );
@ -135,7 +139,7 @@ function wc_create_order( $args = array() ) {
* @return string | WC_Order * @return string | WC_Order
*/ */
function wc_update_order( $args ) { function wc_update_order( $args ) {
if ( ! $args['order_id'] ) { if ( empty( $args['order_id'] ) ) {
return new WP_Error( __( 'Invalid order ID.', 'woocommerce' ) ); return new WP_Error( __( 'Invalid order ID.', 'woocommerce' ) );
} }
return wc_create_order( $args ); return wc_create_order( $args );

28
tests/unit-tests/core/functions.php
View File

@ -24,4 +24,32 @@ class WC_Tests_WooCommerce_Functions extends WC_Unit_Test_Case {
wc_maybe_define_constant( 'WC_TESTING_DEFINE_FUNCTION', false ); wc_maybe_define_constant( 'WC_TESTING_DEFINE_FUNCTION', false );
$this->assertTrue( WC_TESTING_DEFINE_FUNCTION ); $this->assertTrue( WC_TESTING_DEFINE_FUNCTION );
} }
/**
* Tests wc_create_order() and wc_update_order() currency handling.
*
* @since 3.2.0
*/
public function test_wc_create_update_order_currency() {
$old_currency = get_woocommerce_currency();
$new_currency = 'BGN';
update_option( 'woocommerce_currency', $new_currency );
// New order should be created using shop currency.
$order = wc_create_order( array(
'status' => 'pending',
'customer_id' => 1,
) );
$this->assertEquals( $new_currency, $order->get_currency() );
update_option( 'woocommerce_currency', $old_currency );
// Currency should not change when order is updated.
$order = wc_update_order( array(
'customer_id' => 2,
'order_id' => $order->get_id(),
) );
$this->assertEquals( $new_currency, $order->get_currency() );
}
} }