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

Respect manual offsets in default before/after params (https://github.com/woocommerce/woocommerce-admin/pull/2042)

This commit is contained in:
Albert Juhé Lluveras 2019-04-15 19:28:19 +02:00 committed by GitHub
parent b134853e83
commit dab7cf7dff
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php
View File

@ -44,8 +44,13 @@ class WC_Admin_Reports_Interval {
* @return DateTime
*/
public static function default_before() {
$datetime = new DateTime();
$datetime->setTimezone( new DateTimeZone( wc_timezone_string() ) );
$datetime = new WC_DateTime();
// Set local timezone or offset.
if ( get_option( 'timezone_string' ) ) {
$datetime->setTimezone( new DateTimeZone( wc_timezone_string() ) );
} else {
$datetime->set_utc_offset( wc_timezone_offset() );
}
return $datetime;
}
@ -58,9 +63,14 @@ class WC_Admin_Reports_Interval {
$now = time();
$week_back = $now - WEEK_IN_SECONDS;
$datetime = new DateTime();
$datetime = new WC_DateTime();
$datetime->setTimestamp( $week_back );
$datetime->setTimezone( new DateTimeZone( wc_timezone_string() ) );
// Set local timezone or offset.
if ( get_option( 'timezone_string' ) ) {
$datetime->setTimezone( new DateTimeZone( wc_timezone_string() ) );
} else {
$datetime->set_utc_offset( wc_timezone_offset() );
}
return $datetime;
}

12
plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-data-store.php
View File

@ -572,13 +572,21 @@ class WC_Admin_Reports_Data_Store {
);
if ( isset( $query_args['before'] ) && '' !== $query_args['before'] ) {
$datetime_str = $query_args['before']->format( WC_Admin_Reports_Interval::$sql_datetime_format );
if ( is_a( $query_args['before'], 'WC_DateTime' ) ) {
$datetime_str = $query_args['before']->date( WC_Admin_Reports_Interval::$sql_datetime_format );
} else {
$datetime_str = $query_args['before']->format( WC_Admin_Reports_Interval::$sql_datetime_format );
}
$sql_query['where_time_clause'] .= " AND {$table_name}.date_created <= '$datetime_str'";
}
if ( isset( $query_args['after'] ) && '' !== $query_args['after'] ) {
$datetime_str = $query_args['after']->format( WC_Admin_Reports_Interval::$sql_datetime_format );
if ( is_a( $query_args['after'], 'WC_DateTime' ) ) {
$datetime_str = $query_args['after']->date( WC_Admin_Reports_Interval::$sql_datetime_format );
} else {
$datetime_str = $query_args['after']->format( WC_Admin_Reports_Interval::$sql_datetime_format );
}
$sql_query['where_time_clause'] .= " AND {$table_name}.date_created >= '$datetime_str'";
}