From e273d055efc29a0f7f42a152d91ac7f06261b7cb Mon Sep 17 00:00:00 2001 From: Peter Fabian Date: Wed, 5 Dec 2018 13:15:42 +0100 Subject: [PATCH] Moved functions from orders data store to allow code reuse. --- .../class-wc-admin-reports-interval.php | 65 ++++++++++++++++++ ...ass-wc-admin-reports-orders-data-store.php | 67 +------------------ 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php b/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php index 94921358ab4..6d1b5e8413b 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php @@ -409,4 +409,69 @@ class WC_Admin_Reports_Interval { return call_user_func( array( __CLASS__, "next_{$time_interval}_start" ), $datetime, $reversed ); } + /** + * Returns expected number of items on the page in case of date ordering. + * + * @param int $expected_interval_count Expected number of intervals in total. + * @param int $items_per_page Number of items per page. + * @param int $page_no Page number. + * + * @return float|int + */ + public static function expected_intervals_on_page( $expected_interval_count, $items_per_page, $page_no ) { + $total_pages = (int) ceil( $expected_interval_count / $items_per_page ); + if ( $page_no < $total_pages ) { + return $items_per_page; + } elseif ( $page_no === $total_pages ) { + return $expected_interval_count - ( $page_no - 1 ) * $items_per_page; + } else { + return 0; + } + } + + /** + * Returns true if there are any intervals that need to be filled in the response. + * + * @param int $expected_interval_count Expected number of intervals in total. + * @param int $db_records Total number of records for given period in the database. + * @param int $items_per_page Number of items per page. + * @param int $page_no Page number. + * @param string $order asc or desc. + * @param string $order_by Column by which the result will be sorted. + * @param int $intervals_count Number of records for given (possibly shortened) time interval. + * + * @return bool + */ + public static function intervals_missing( $expected_interval_count, $db_records, $items_per_page, $page_no, $order, $order_by, $intervals_count ) { + if ( $expected_interval_count > $db_records ) { + if ( 'date' === $order_by ) { + $expected_intervals_on_page = self::expected_intervals_on_page( $expected_interval_count, $items_per_page, $page_no ); + if ( $intervals_count < $expected_intervals_on_page ) { + return true; + } else { + return false; + } + } else { + if ( 'desc' === $order ) { + if ( $page_no > floor( $db_records / $items_per_page ) ) { + return true; + } else { + return false; + } + } elseif ( 'asc' === $order ) { + if ( $page_no <= ceil( ( $expected_interval_count - $db_records ) / $items_per_page ) ) { + return true; + } else { + return false; + } + } else { + // Invalid ordering. + return false; + } + } + } else { + return false; + } + } + } diff --git a/plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-orders-data-store.php b/plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-orders-data-store.php index cd13a54a3cd..186865a2f28 100644 --- a/plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-orders-data-store.php +++ b/plugins/woocommerce-admin/includes/data-stores/class-wc-admin-reports-orders-data-store.php @@ -101,71 +101,6 @@ class WC_Admin_Reports_Orders_Data_Store extends WC_Admin_Reports_Data_Store imp } } - /** - * Returns expected number of items on the page in case of date ordering. - * - * @param int $expected_interval_count Expected number of intervals in total. - * @param int $items_per_page Number of items per page. - * @param int $page_no Page number. - * - * @return float|int - */ - protected function expected_intervals_on_page( $expected_interval_count, $items_per_page, $page_no ) { - $total_pages = (int) ceil( $expected_interval_count / $items_per_page ); - if ( $page_no < $total_pages ) { - return $items_per_page; - } elseif ( $page_no === $total_pages ) { - return $expected_interval_count - ( $page_no - 1 ) * $items_per_page; - } else { - return 0; - } - } - - /** - * Returns true if there are any intervals that need to be filled in the response. - * - * @param int $expected_interval_count Expected number of intervals in total. - * @param int $db_records Total number of records for given period in the database. - * @param int $items_per_page Number of items per page. - * @param int $page_no Page number. - * @param string $order asc or desc. - * @param string $order_by Column by which the result will be sorted. - * @param int $intervals_count Number of records for given (possibly shortened) time interval. - * - * @return bool - */ - protected function intervals_missing( $expected_interval_count, $db_records, $items_per_page, $page_no, $order, $order_by, $intervals_count ) { - if ( $expected_interval_count > $db_records ) { - if ( 'date' === $order_by ) { - $expected_intervals_on_page = $this->expected_intervals_on_page( $expected_interval_count, $items_per_page, $page_no ); - if ( $intervals_count < $expected_intervals_on_page ) { - return true; - } else { - return false; - } - } else { - if ( 'desc' === $order ) { - if ( $page_no > floor( $db_records / $items_per_page ) ) { - return true; - } else { - return false; - } - } elseif ( 'asc' === $order ) { - if ( $page_no <= ceil( ( $expected_interval_count - $db_records ) / $items_per_page ) ) { - return true; - } else { - return false; - } - } else { - // Invalid ordering. - return false; - } - } - } else { - return false; - } - } - /** * Updates the totals and intervals database queries with parameters used for Orders report: categories, coupons and order status. * @@ -394,7 +329,7 @@ class WC_Admin_Reports_Orders_Data_Store extends WC_Admin_Reports_Data_Store imp 'page_no' => (int) $query_args['page'], ); - if ( $this->intervals_missing( $expected_interval_count, $db_interval_count, $intervals_query['per_page'], $query_args['page'], $query_args['order'], $query_args['orderby'], count( $intervals ) ) ) { + if ( WC_Admin_Reports_Interval::intervals_missing( $expected_interval_count, $db_interval_count, $intervals_query['per_page'], $query_args['page'], $query_args['order'], $query_args['orderby'], count( $intervals ) ) ) { $this->fill_in_missing_intervals( $db_intervals, $query_args['adj_after'], $query_args['adj_before'], $query_args['interval'], $data ); $this->sort_intervals( $data, $query_args['orderby'], $query_args['order'] ); $this->remove_extra_records( $data, $query_args['page'], $intervals_query['per_page'], $db_interval_count, $expected_interval_count, $query_args['orderby'] );