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

Merge branch 'master' into fix/1012-2

This commit is contained in:
Peter Fabian 2019-01-23 21:40:09 +01:00
parent 33f1240987 5b46862584
commit 64f1418f22
4 changed files with 352 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,11 +170,29 @@ class WC_Admin_Reports_Interval {
switch ( $interval ) {
case 'hour':
$diff_timestamp = (int) $end_datetime->format( 'U' ) - (int) $start_datetime->format( 'U' );
return (int) floor( ( (int) $diff_timestamp ) / HOUR_IN_SECONDS ) + 1;
$end_timestamp = (int) $end_datetime->format( 'U' );
$start_timestamp = (int) $start_datetime->format( 'U' );
$addendum = 0;
$end_min_sec = $end_timestamp % HOUR_IN_SECONDS;
$start_min_sec = $start_timestamp % HOUR_IN_SECONDS;
if ( $end_min_sec < $start_min_sec ) {
$addendum = 1;
}
$diff_timestamp = $end_timestamp - $start_timestamp;
return (int) floor( ( (int) $diff_timestamp ) / HOUR_IN_SECONDS ) + 1 + $addendum;
case 'day':
$diff_timestamp = (int) $end_datetime->format( 'U' ) - (int) $start_datetime->format( 'U' );
return (int) floor( ( (int) $diff_timestamp ) / DAY_IN_SECONDS ) + 1;
$end_timestamp = (int) $end_datetime->format( 'U' );
$start_timestamp = (int) $start_datetime->format( 'U' );
$addendum = 0;
$end_hour_min_sec = $end_timestamp % DAY_IN_SECONDS;
$start_hour_min_sec = $start_timestamp % DAY_IN_SECONDS;
if ( $end_hour_min_sec < $start_hour_min_sec ) {
$addendum = 1;
}
$diff_timestamp = $end_timestamp - $start_timestamp;
return (int) floor( ( (int) $diff_timestamp ) / DAY_IN_SECONDS ) + 1 + $addendum;
case 'week':
// TODO: optimize? approximately day count / 7, but year end is tricky, a week can have fewer days.
$week_count = 0;

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

@ -297,13 +297,15 @@ class WC_Admin_Reports_Data_Store {
$new_end_date = clone $new_start_date;
for ( $i = 0; $i < $intervals_query['per_page']; $i++ ) {
if ( $new_end_date > $latest_end_date ) {
$new_end_date = $latest_end_date;
$end_iteration = 0;
break;
}
$new_end_date = WC_Admin_Reports_Interval::iterate( $new_end_date, $query_args['interval'] );
$end_iteration ++;
}
if ( $new_end_date > $latest_end_date ) {
$new_end_date = $latest_end_date;
$end_iteration = 0;
}
if ( $end_iteration ) {
$new_end_date_timestamp = (int) $new_end_date->format( 'U' ) - 1;
$new_end_date->setTimestamp( $new_end_date_timestamp );
@ -326,13 +328,15 @@ class WC_Admin_Reports_Data_Store {
$new_start_date = clone $new_end_date;
for ( $i = 0; $i < $intervals_query['per_page']; $i++ ) {
if ( $new_start_date < $earliest_start_date ) {
$new_start_date = $earliest_start_date;
$start_iteration = 0;
break;
}
$new_start_date = WC_Admin_Reports_Interval::iterate( $new_start_date, $query_args['interval'], true );
$start_iteration ++;
}
if ( $new_start_date < $earliest_start_date ) {
$new_start_date = $earliest_start_date;
$start_iteration = 0;
}
if ( $start_iteration ) {
// TODO: is this correct? should it only be added if iterate runs? other two iterate instances, too?
$new_start_date_timestamp = (int) $new_start_date->format( 'U' ) + 1;

34
plugins/woocommerce-admin/tests/api/reports-interval.php
View File

@ -419,14 +419,28 @@ class WC_Tests_Reports_Interval_Stats extends WC_Unit_Test_Case {
'year' => 1,
),
),
// 23:59:59 h:m:s interval -> 24 hours, 1 for the rest
// 8.0186111 hours interval length -> 10 hours, 2 days, 1 for the rest
array(
'start' => '2019-01-16T16:59:00Z',
'end' => '2019-01-17T01:00:07Z',
'week_start' => 1,
'intervals' => array(
'hour' => 10,
'day' => 2,
'week' => 1,
'month' => 1,
'quarter' => 1,
'year' => 1,
),
),
// 23:59:59 h:m:s interval -> 24 hours, 2 days, 1 for the rest
array(
'start' => '2017-12-24T11:00:00Z',
'end' => '2017-12-25T10:59:59Z',
'week_start' => 1,
'intervals' => array(
'hour' => 24,
'day' => 1,
'day' => 2,
'week' => 2,
'month' => 1,
'quarter' => 1,
@ -475,42 +489,42 @@ class WC_Tests_Reports_Interval_Stats extends WC_Unit_Test_Case {
'year' => 1,
),
),
// 1 month + 14 hour interval spanning 2 months in 1 quarter -> 735 hours, 31 days, 6 iso weeks, 2 months
// 1 month + 14 hour interval spanning 2 months in 1 quarter -> 735 hours, 32 days, 6 iso weeks, 2 months
array(
'start' => '2017-11-24T11:00:00Z',
'end' => '2017-12-25T01:00:00Z',
'week_start' => 1,
'intervals' => array(
'hour' => 30 * 24 + 14 + 1, // 30 full days + 14 full hours + 1 second from next hour
'day' => 31,
'hour' => 30 * 24 + 13 + 2, // 30 full days + 13 full hours on Nov 24 + 2 hours on Dec 25
'day' => 32,
'week' => 6,
'month' => 2,
'quarter' => 1,
'year' => 1,
),
),
// 1 month interval spanning 2 months and 2 quarters, 1 year -> 720 hours, 30 days, 6 iso weeks, 2 months, 2 q, 1 y
// 1 month interval spanning 2 months and 2 quarters, 1 year -> 720 hours, 31 days, 6 iso weeks, 2 months, 2 q, 1 y
array(
'start' => '2017-09-24T11:00:00Z',
'end' => '2017-10-24T10:59:59Z',
'week_start' => 1,
'intervals' => array(
'hour' => 30 * 24,
'day' => 30, // Sept has 30 days.
'day' => 31, // Sept has 30 days, but need to include interval for half of Sept 24 and interval for half of Oct 24.
'week' => 6,
'month' => 2,
'quarter' => 2,
'year' => 1,
),
),
// 1 month interval spanning 2 months and 2 quarters, 2 years -> 744 hours, 30 days, 5 iso weeks, 2 months, 2 quarters, 2 years
// 1 month interval spanning 2 months and 2 quarters, 2 years -> 744 hours, 32 days, 6 iso weeks, 2 months, 2 quarters, 2 years
array(
'start' => '2017-12-24T11:00:00Z',
'end' => '2018-01-24T10:59:59Z',
'week_start' => 1,
'intervals' => array(
'hour' => 31 * 24,
'day' => 31, // Dec has 31 days.
'day' => 32, // Dec has 31 days, plus 1 interval for half day at the end.
'week' => 6,
'month' => 2,
'quarter' => 2,
@ -587,7 +601,7 @@ class WC_Tests_Reports_Interval_Stats extends WC_Unit_Test_Case {
foreach ( $test_settings as $setting ) {
update_option( 'start_of_week', $setting['week_start'] );
foreach ( $setting['intervals'] as $interval => $exp_value ) {
$this->assertEquals( $exp_value, WC_Admin_Reports_Interval::intervals_between( $setting['start'], $setting['end'], $interval ), "FDoW: {$setting['week_start']}; Start: {$setting['start']}; End: {$setting['end']}; Interval: {$interval}" );
$this->assertEquals( $exp_value, WC_Admin_Reports_Interval::intervals_between( $setting['start'], $setting['end'], $interval ), "First Day of Week: {$setting['week_start']}; Start: {$setting['start']}; End: {$setting['end']}; Interval: {$interval}" );
}
}
}

586
plugins/woocommerce-admin/tests/reports/class-wc-tests-reports-orders-stats.php
View File

File diff suppressed because it is too large Load Diff