From 41bec03880e9456fdfc55a76583c33abdc2ed692 Mon Sep 17 00:00:00 2001 From: Paul Sealock Date: Tue, 29 Jan 2019 11:28:58 +1300 Subject: [PATCH] tweeks --- .../class-wc-admin-rest-reports-customers-controller.php | 8 ++++---- ...s-wc-admin-rest-reports-customers-stats-controller.php | 8 ++++---- .../includes/class-wc-admin-reports-interval.php | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-controller.php b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-controller.php index 99c093f587f..33c67a1fd39 100644 --- a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-controller.php +++ b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-controller.php @@ -61,10 +61,10 @@ class WC_Admin_REST_Reports_Customers_Controller extends WC_REST_Reports_Control $args['last_order_before'] = $request['last_order_before']; $args['last_order_after'] = $request['last_order_after']; - $numeric_between_params = array( 'orders_count', 'total_spend', 'avg_order_value' ); - $date_between_params = array( 'last_active', 'registered' ); - $normalized = WC_Admin_Reports_Interval::normalize_between_params( $request, $numeric_between_params, false ); - $normalized_dates = WC_Admin_Reports_Interval::normalize_between_params( $request, $date_between_params, true ); + $between_params_numeric = array( 'orders_count', 'total_spend', 'avg_order_value' ); + $between_params_date = array( 'last_active', 'registered' ); + $normalized = WC_Admin_Reports_Interval::normalize_between_params( $request, $between_params_numeric, false ); + $normalized_dates = WC_Admin_Reports_Interval::normalize_between_params( $request, $between_params_date, true ); $args = array_merge( $args, $normalized, $normalized_dates ); return $args; diff --git a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-stats-controller.php b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-stats-controller.php index fadb5b8736f..aa9a7f163ca 100644 --- a/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-stats-controller.php +++ b/plugins/woocommerce-admin/includes/api/class-wc-admin-rest-reports-customers-stats-controller.php @@ -56,10 +56,10 @@ class WC_Admin_REST_Reports_Customers_Stats_Controller extends WC_REST_Reports_C $args['last_order_before'] = $request['last_order_before']; $args['last_order_after'] = $request['last_order_after']; - $numeric_between_params = array( 'orders_count', 'total_spend', 'avg_order_value' ); - $date_between_params = array( 'last_active', 'registered' ); - $normalized = WC_Admin_Reports_Interval::normalize_between_params( $request, $numeric_between_params, false ); - $normalized_dates = WC_Admin_Reports_Interval::normalize_between_params( $request, $date_between_params, true ); + $between_params_numeric = array( 'orders_count', 'total_spend', 'avg_order_value' ); + $between_params_date = array( 'last_active', 'registered' ); + $normalized = WC_Admin_Reports_Interval::normalize_between_params( $request, $between_params_numeric, false ); + $normalized_dates = WC_Admin_Reports_Interval::normalize_between_params( $request, $between_params_date, true ); $args = array_merge( $args, $normalized, $normalized_dates ); return $args; 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 5036d2fcab4..2bc1465c147 100644 --- a/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php +++ b/plugins/woocommerce-admin/includes/class-wc-admin-reports-interval.php @@ -494,7 +494,8 @@ class WC_Admin_Reports_Interval { } /** - * Normalize "*_between" parameters to "*_min" and "*_max". + * Normalize "*_between" parameters to "*_min" and "*_max" for numeric values + * and "*_after" and "*_before" for date values. * * @param array $request Query params from REST API request. * @param string|array $param_names One or more param names to handle. Should not include "_between" suffix.