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

Ensure the HPOS/COT order status correctly tracks the CPT order status (#35402) 

Ensure the HPOS/COT order status correctly tracks the CPT order status (during manual order creation).

* Linting.
* Address coding standards (no need to prepare the query when there are no placeholders).
* Woops! Restore use of `$wpdb->prepare()`, add phpcs:ignore rule.
This commit is contained in:
Barry Hughes 2022-10-31 14:12:14 -07:00 committed by GitHub
parent aea554bcdb
commit 2355822ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce/changelog/fix-35360-sync-on-manual-order-creation Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
When HPOS is enabled, posts are authoritative, and sync is enabled, ensure the HPOS record correctly tracks the CPT order record.

5
plugins/woocommerce/src/Internal/DataStores/Orders/DataSynchronizer.php
View File

@ -68,6 +68,7 @@ class DataSynchronizer implements BatchProcessorInterface {
*/
public function __construct() {
self::add_action( 'deleted_post', array( $this, 'handle_deleted_post' ), 10, 2 );
self::add_action( 'woocommerce_new_order', array( $this, 'handle_updated_order' ), 100 );
self::add_action( 'woocommerce_update_order', array( $this, 'handle_updated_order' ), 100 );
self::add_filter( 'woocommerce_feature_description_tip', array( $this, 'handle_feature_description_tip' ), 10, 3 );
}
@ -255,7 +256,9 @@ SELECT(
// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
switch ( $type ) {
case self::ID_TYPE_MISSING_IN_ORDERS_TABLE:
$sql = $wpdb->prepare("
// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- $order_post_type_placeholders is prepared.
$sql = $wpdb->prepare(
"
SELECT posts.ID FROM $wpdb->posts posts
LEFT JOIN $orders_table orders ON posts.ID = orders.id
WHERE

46
plugins/woocommerce/tests/php/src/Internal/DataStores/Orders/DataSynchronizerTests.php
View File

@ -146,4 +146,50 @@ class DataSynchronizerTests extends WC_Unit_Test_Case {
'The order was successfully copied to the COT table, outside of a dedicated synchronization batch.'
);
}
/**
* When sync is enbabled and the posts store is authoritative, creating an order and updating the status from
* draft to some non-draft status (as happens when an order is manually created in the admin environment) should
* result in the same status change being made in the duplicate COT record.
*/
public function test_status_syncs_correctly_after_order_creation() {
global $wpdb;
$orders_table = OrdersTableDataStore::get_orders_table_name();
// Enable sync, make the posts table authoritative.
update_option( $this->sut::ORDERS_DATA_SYNC_ENABLED_OPTION, 'yes' );
update_option( CustomOrdersTableController::CUSTOM_ORDERS_TABLE_USAGE_ENABLED_OPTION, 'no' );
// When a new order is manually created in the admin environment, WordPress automatically creates an empty
// draft post for us.
$order_id = (int) wp_insert_post(
array(
'post_type' => 'shop_order',
'post_status' => 'draft',
)
);
// Once the admin user decides to go ahead and save the order (ie, they click 'Create'), we start performing
// various updates to the order record.
wc_get_order( $order_id )->save();
// As soon as the order is saved via our own internal API, the DataSynchronizer should create a copy of the
// record in the COT table.
$this->assertEquals(
'draft',
$wpdb->get_var( "SELECT status FROM $orders_table WHERE id = $order_id" ), // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
'When HPOS is enabled but the posts data store is authoritative, saving an order will result in a duplicate with the same status being saved in the COT table.'
);
// In a separate operation, the status will be updated to an actual non-draft order status. This should also be
// observed by the DataSynchronizer and a further update made to the COT table.
$order = wc_get_order( $order_id );
$order->set_status( 'pending' );
$order->save();
$this->assertEquals(
'wc-pending',
$wpdb->get_var( "SELECT status FROM $orders_table WHERE id = $order_id" ), //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
'When the order status is updated, the change should be observed by the DataSynhronizer and a matching update will take place in the COT table.'
);
}
}