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 woocommerce/woocommerce-admin#2265 from woocommerce/fix/2229-exclude-drafts-import 

Exclude auto-draft and trashed orders from imports.
This commit is contained in:
Jeff Stieler 2019-05-20 14:39:11 -06:00 committed by GitHub
parent 765fbc6799 0d863ae7a6
commit 7a6c7add9e
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-admin/includes/class-wc-admin-reports-sync.php
View File

@ -351,6 +351,7 @@ class WC_Admin_Reports_Sync {
$count = $wpdb->get_var(
"SELECT COUNT(*) FROM {$wpdb->posts}
WHERE post_type IN ( 'shop_order', 'shop_order_refund' )
AND post_status NOT IN ( 'auto-draft', 'trash' )
{$where_clause}"
); // WPCS: unprepared SQL ok.
@ -358,6 +359,7 @@ class WC_Admin_Reports_Sync {
$wpdb->prepare(
"SELECT ID FROM {$wpdb->posts}
WHERE post_type IN ( 'shop_order', 'shop_order_refund' )
AND post_status NOT IN ( 'auto-draft', 'trash' )
{$where_clause}
ORDER BY post_date ASC
LIMIT %d

24
plugins/woocommerce-admin/tests/api/reports-import.php
View File

@ -301,6 +301,7 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
$product->set_regular_price( 25 );
$product->save();
// Create 5 completed orders.
for ( $i = 0; $i < 5; $i++ ) {
$order = WC_Helper_Order::create_order( 1, $product );
$order->set_status( 'completed' );
@ -308,6 +309,21 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
$order->save();
}
// Trash one test order - excludes it from totals.
$order->set_status( 'trash' );
$order->save();
// Create 1 draft order - to be excluded from totals.
$order = WC_Helper_Order::create_order( 1, $product );
$order->set_date_created( time() - ( 5 * DAY_IN_SECONDS ) );
$order->save();
wp_update_post(
array(
'ID' => $order->get_id(),
'post_status' => 'auto-draft',
)
);
// Test totals and total params.
$request = new WP_REST_Request( 'GET', $this->endpoint . '/totals' );
$response = $this->server->dispatch( $request );
@ -320,7 +336,7 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
);
$this->assertEquals( 200, $response->get_status() );
$this->assertEquals( $i, $report['orders'] );
$this->assertEquals( 4, $report['orders'] );
$this->assertEquals( $user_query->get_total(), $report['customers'] );
// Test totals with days param.
@ -349,7 +365,7 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
$this->assertEquals( 0, $report['customers_count'] );
$this->assertEquals( 3, $report['customers_total'] );
$this->assertEquals( 0, $report['orders_count'] );
$this->assertEquals( 5, $report['orders_total'] );
$this->assertEquals( 4, $report['orders_total'] );
// Run pending thrice to process batch and order.
WC_Helper_Queue::process_pending();
@ -365,8 +381,8 @@ class WC_Tests_API_Reports_Import extends WC_REST_Unit_Test_Case {
$this->assertEquals( false, $report['is_importing'] );
$this->assertEquals( 1, $report['customers_count'] );
$this->assertEquals( 3, $report['customers_total'] );
$this->assertEquals( 5, $report['orders_count'] );
$this->assertEquals( 5, $report['orders_total'] );
$this->assertEquals( 4, $report['orders_count'] );
$this->assertEquals( 4, $report['orders_total'] );
// Test totals with skip existing param.
$request = new WP_REST_Request( 'GET', $this->endpoint . '/totals' );