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

PSR-4ify the sync class.

This commit is contained in:
Jeff Stieler 2019-08-01 16:06:00 -06:00
parent 55400474ee
commit e509e51552
8 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-import-controller.php
View File

@ -9,6 +9,8 @@
defined( 'ABSPATH' ) || exit; defined( 'ABSPATH' ) || exit;
use Automattic\WooCommerce\Admin\WC_Admin_Reports_Sync;
/** /**
* Reports Imports controller. * Reports Imports controller.
* *

2
plugins/woocommerce-admin/src/WC_Admin_Report_Exporter.php
View File

@ -95,7 +95,7 @@ class WC_Admin_Report_Exporter {
$report_batch_args = array( $export_id, $report_type, $report_args ); $report_batch_args = array( $export_id, $report_type, $report_args );
if ( 0 < $num_batches ) { if ( 0 < $num_batches ) {
\WC_Admin_Reports_Sync::queue_batches( 1, $num_batches, self::REPORT_EXPORT_ACTION, $report_batch_args ); WC_Admin_Reports_Sync::queue_batches( 1, $num_batches, self::REPORT_EXPORT_ACTION, $report_batch_args );
} }
return $total_rows; return $total_rows;

37
plugins/woocommerce-admin/includes/class-wc-admin-reports-sync.php → plugins/woocommerce-admin/src/WC_Admin_Reports_Sync.php
View File

@ -5,10 +5,9 @@
* @package WooCommerce Admin/Classes * @package WooCommerce Admin/Classes
*/ */
defined( 'ABSPATH' ) || exit; namespace Automattic\WooCommerce\Admin;
use \Automattic\WooCommerce\Admin\WC_Admin_Order; defined( 'ABSPATH' ) || exit;
use \Automattic\WooCommerce\Admin\WC_Admin_Order_Refund;
/** /**
* WC_Admin_Reports_Sync Class. * WC_Admin_Reports_Sync Class.
@ -127,7 +126,7 @@ class WC_Admin_Reports_Sync {
*/ */
public static function regenerate_report_data( $days, $skip_existing ) { public static function regenerate_report_data( $days, $skip_existing ) {
if ( self::is_importing() ) { if ( self::is_importing() ) {
return new WP_Error( 'wc_admin_import_in_progress', __( 'An import is already in progress. Please allow the previous import to complete before beginning a new one.', 'woocommerce-admin' ) ); return new \WP_Error( 'wc_admin_import_in_progress', __( 'An import is already in progress. Please allow the previous import to complete before beginning a new one.', 'woocommerce-admin' ) );
} }
self::reset_import_stats( $days, $skip_existing ); self::reset_import_stats( $days, $skip_existing );
@ -154,7 +153,7 @@ class WC_Admin_Reports_Sync {
$previous_import_date = get_option( 'wc_admin_imported_from_date' ); $previous_import_date = get_option( 'wc_admin_imported_from_date' );
$current_import_date = $days ? date( 'Y-m-d 00:00:00', time() - ( DAY_IN_SECONDS * $days ) ) : -1; $current_import_date = $days ? date( 'Y-m-d 00:00:00', time() - ( DAY_IN_SECONDS * $days ) ) : -1;
if ( ! $previous_import_date || -1 === $current_import_date || new DateTime( $previous_import_date ) > new DateTime( $current_import_date ) ) { if ( ! $previous_import_date || -1 === $current_import_date || new \DateTime( $previous_import_date ) > new \DateTime( $current_import_date ) ) {
update_option( 'wc_admin_imported_from_date', $current_import_date ); update_option( 'wc_admin_imported_from_date', $current_import_date );
} }
} }
@ -208,7 +207,7 @@ class WC_Admin_Reports_Sync {
* Clears all queued actions. * Clears all queued actions.
*/ */
public static function clear_queued_actions() { public static function clear_queued_actions() {
$store = ActionScheduler::store(); $store = \ActionScheduler::store();
if ( is_a( $store, 'WC_Admin_ActionScheduler_WPPostStore' ) ) { if ( is_a( $store, 'WC_Admin_ActionScheduler_WPPostStore' ) ) {
// If we're using our data store, call our bespoke deletion method. // If we're using our data store, call our bespoke deletion method.
@ -314,11 +313,11 @@ class WC_Admin_Reports_Sync {
add_action( 'save_post', array( __CLASS__, 'schedule_single_order_import' ) ); add_action( 'save_post', array( __CLASS__, 'schedule_single_order_import' ) );
add_action( 'woocommerce_refund_created', array( __CLASS__, 'schedule_single_order_import' ) ); add_action( 'woocommerce_refund_created', array( __CLASS__, 'schedule_single_order_import' ) );
WC_Admin_Reports_Orders_Stats_Data_Store::init(); \WC_Admin_Reports_Orders_Stats_Data_Store::init();
WC_Admin_Reports_Customers_Data_Store::init(); \WC_Admin_Reports_Customers_Data_Store::init();
WC_Admin_Reports_Coupons_Data_Store::init(); \WC_Admin_Reports_Coupons_Data_Store::init();
WC_Admin_Reports_Products_Data_Store::init(); \WC_Admin_Reports_Products_Data_Store::init();
WC_Admin_Reports_Taxes_Data_Store::init(); \WC_Admin_Reports_Taxes_Data_Store::init();
} }
/** /**
@ -457,10 +456,10 @@ class WC_Admin_Reports_Sync {
$result = array_sum( $result = array_sum(
array( array(
WC_Admin_Reports_Orders_Stats_Data_Store::sync_order( $order_id ), \WC_Admin_Reports_Orders_Stats_Data_Store::sync_order( $order_id ),
WC_Admin_Reports_Products_Data_Store::sync_order_products( $order_id ), \WC_Admin_Reports_Products_Data_Store::sync_order_products( $order_id ),
WC_Admin_Reports_Coupons_Data_Store::sync_order_coupons( $order_id ), \WC_Admin_Reports_Coupons_Data_Store::sync_order_coupons( $order_id ),
WC_Admin_Reports_Taxes_Data_Store::sync_order_taxes( $order_id ), \WC_Admin_Reports_Taxes_Data_Store::sync_order_taxes( $order_id ),
) )
); );
@ -630,7 +629,7 @@ class WC_Admin_Reports_Sync {
add_action( 'pre_user_query', array( __CLASS__, 'exclude_existing_customers_from_query' ) ); add_action( 'pre_user_query', array( __CLASS__, 'exclude_existing_customers_from_query' ) );
} }
$customer_query = new WP_User_Query( $query_args ); $customer_query = new \WP_User_Query( $query_args );
remove_action( 'pre_user_query', array( __CLASS__, 'exclude_existing_customers_from_query' ) ); remove_action( 'pre_user_query', array( __CLASS__, 'exclude_existing_customers_from_query' ) );
@ -707,7 +706,7 @@ class WC_Admin_Reports_Sync {
foreach ( $customer_ids as $customer_id ) { foreach ( $customer_ids as $customer_id ) {
// @todo Schedule single customer update if this fails? // @todo Schedule single customer update if this fails?
WC_Admin_Reports_Customers_Data_Store::update_registered_customer( $customer_id ); \WC_Admin_Reports_Customers_Data_Store::update_registered_customer( $customer_id );
} }
$imported_count = get_option( 'wc_admin_import_customers_count', 0 ); $imported_count = get_option( 'wc_admin_import_customers_count', 0 );
@ -752,7 +751,7 @@ class WC_Admin_Reports_Sync {
); );
foreach ( $customer_ids as $customer_id ) { foreach ( $customer_ids as $customer_id ) {
WC_Admin_Reports_Customers_Data_Store::delete_customer( $customer_id ); \WC_Admin_Reports_Customers_Data_Store::delete_customer( $customer_id );
} }
wc_admin_record_tracks_event( 'delete_import_data_job_complete', array( 'type' => 'customer' ) ); wc_admin_record_tracks_event( 'delete_import_data_job_complete', array( 'type' => 'customer' ) );
@ -794,7 +793,7 @@ class WC_Admin_Reports_Sync {
); );
foreach ( $order_ids as $order_id ) { foreach ( $order_ids as $order_id ) {
WC_Admin_Reports_Orders_Stats_Data_Store::delete_order( $order_id ); \WC_Admin_Reports_Orders_Stats_Data_Store::delete_order( $order_id );
} }
wc_admin_record_tracks_event( 'delete_import_data_job_complete', array( 'type' => 'order' ) ); wc_admin_record_tracks_event( 'delete_import_data_job_complete', array( 'type' => 'order' ) );

2
plugins/woocommerce-admin/tests/api-init.php
View File

@ -6,6 +6,8 @@
* @since 3.5.0 * @since 3.5.0
*/ */
use Automattic\WooCommerce\Admin\WC_Admin_Reports_Sync;
/** /**
* Class WC_Tests_API_Init * Class WC_Tests_API_Init
*/ */

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

@ -5,6 +5,8 @@
* @package WooCommerce\Tests\API * @package WooCommerce\Tests\API
*/ */
use Automattic\WooCommerce\Admin\WC_Admin_Reports_Sync;
/** /**
* Reports Import REST API Test Class * Reports Import REST API Test Class
* *

2
plugins/woocommerce-admin/tests/batch-queue.php
View File

@ -6,6 +6,8 @@
* @since 3.5.0 * @since 3.5.0
*/ */
use Automattic\WooCommerce\Admin\WC_Admin_Reports_Sync;
/** /**
* Reports Generation Batch Queue Test Class * Reports Generation Batch Queue Test Class
* *

2
plugins/woocommerce-admin/tests/queue-priority.php
View File

@ -6,6 +6,8 @@
* @since 3.5.0 * @since 3.5.0
*/ */
use Automattic\WooCommerce\Admin\WC_Admin_Reports_Sync;
/** /**
* Reports Generation Batch Queue Prioritizaion Test Class * Reports Generation Batch Queue Prioritizaion Test Class
* *

1
plugins/woocommerce-admin/woocommerce-admin.php
View File

@ -25,6 +25,7 @@ use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Order_Milestones;
use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Welcome_Message; use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Welcome_Message;
use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Woo_Subscriptions_Notes; use Automattic\WooCommerce\Admin\Notes\WC_Admin_Notes_Woo_Subscriptions_Notes;
use Automattic\WooCommerce\Admin\WC_Admin_Report_Exporter; use Automattic\WooCommerce\Admin\WC_Admin_Report_Exporter;
use Automattic\WooCommerce\Admin\WC_Admin_Reports_Sync;
/** /**
* Autoload packages. * Autoload packages.