-
-
-
-
-
-
+ '_edd_bundled_products[' . $index . ']',
+ 'id' => 'edd_bundled_products_' . esc_attr( $index ),
+ 'selected' => $product,
+ 'multiple' => false,
+ 'chosen' => true,
+ 'products' => $bundle_options,
+ 'variations' => true,
+ 'show_variations_only' => false,
+ 'class' => 'edd-form-group__input',
+ 'bundles' => false,
+ 'exclude_current' => true,
+ 'show_option_empty' => __( 'Select a product', 'easy-digital-downloads' ),
+ 'show_option_all' => false,
+ );
+ ?>
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+
diff --git a/includes/admin/downloads/views/metabox-files.php b/includes/admin/downloads/views/metabox-files.php
index 9deabbb019d..c83299c8483 100644
--- a/includes/admin/downloads/views/metabox-files.php
+++ b/includes/admin/downloads/views/metabox-files.php
@@ -23,17 +23,19 @@
$thumbnail_size = isset( $value['thumbnail_size'] ) ? $value['thumbnail_size'] : '';
$attachment_id = isset( $value['attachment_id'] ) ? absint( $value['attachment_id'] ) : false;
- $args = apply_filters( 'edd_file_row_args', compact( 'name', 'file', 'condition', 'attachment_id', 'thumbnail_size' ), $value ); ?>
+ $args = apply_filters( 'edd_file_row_args', compact( 'name', 'file', 'condition', 'attachment_id', 'thumbnail_size' ), $value );
+ ?>
-
+
+ else :
+ ?>
-
+
diff --git a/includes/admin/payments/orders.php b/includes/admin/payments/orders.php
index b2937362b81..6f33cd5f08f 100644
--- a/includes/admin/payments/orders.php
+++ b/includes/admin/payments/orders.php
@@ -188,12 +188,7 @@ function edd_get_order_details_sections( $order ) {
* @param EDD\Orders\Order $order The order object.
*/
function edd_order_details_customer( $order ) {
- $customer = edd_get_customer( $order->customer_id );
- $payment = edd_get_payment( $order->id );
- $user_info = $payment
- ? $payment->user_info
- : array();
-
+ $customer = edd_get_customer( $order->customer_id );
$change_text = edd_is_add_order_page()
? esc_html__( 'Assign', 'easy-digital-downloads' )
: esc_html__( 'Switch Customer', 'easy-digital-downloads' );
@@ -299,8 +294,11 @@ function edd_order_details_customer( $order ) {
id );
+ $user_info = $payment ? $payment->user_info : array();
do_action( 'edd_payment_personal_details_list', $payment->get_meta(), $user_info );
}
do_action( 'edd_payment_view_details', $order->id );
@@ -1093,13 +1091,14 @@ function edd_order_details_extras( $order = false ) {
*
* @since 3.0
*
- * @param object $order
+ * @param EDD\Orders\Order $order Order object.
*/
function edd_order_details_attributes( $order ) {
- $recovery_url = edd_is_add_order_page()
- ? ''
- : edd_get_payment( $order->id )->get_recovery_url();
+ $recovery_url = '';
+ if ( ! edd_is_add_order_page() ) {
+ $recovery_url = $order->get_recovery_url();
+ }
$order_date = edd_get_edd_timezone_equivalent_date_from_utc( EDD()->utils->date( $order->date_created, 'utc', true ) );
diff --git a/includes/admin/reporting/class-api-requests-logs-list-table.php b/includes/admin/reporting/class-api-requests-logs-list-table.php
index 7c2b3ae37f5..ee02a4c7dd9 100755
--- a/includes/admin/reporting/class-api-requests-logs-list-table.php
+++ b/includes/admin/reporting/class-api-requests-logs-list-table.php
@@ -9,7 +9,7 @@
* @since 1.5
*/
-// Exit if accessed directly
+// Exit if accessed directly.
defined( 'ABSPATH' ) || exit;
/**
@@ -27,16 +27,6 @@ class EDD_API_Request_Log_Table extends EDD_Base_Log_List_Table {
*/
protected $log_type = 'api_requests';
- /**
- * Get things started
- *
- * @since 1.5
- * @see WP_List_Table::__construct()
- */
- public function __construct() {
- parent::__construct();
- }
-
/**
* Retrieve the table columns
*
@@ -45,12 +35,12 @@ public function __construct() {
*/
public function get_columns() {
return array(
- 'ID' => __( 'Log ID', 'easy-digital-downloads' ),
+ 'ID' => __( 'Log ID', 'easy-digital-downloads' ),
'details' => __( 'Request Details', 'easy-digital-downloads' ),
- 'version' => __( 'API Version', 'easy-digital-downloads' ),
- 'ip' => __( 'Request IP', 'easy-digital-downloads' ),
- 'speed' => __( 'Request Speed', 'easy-digital-downloads' ),
- 'date' => __( 'Date', 'easy-digital-downloads' )
+ 'version' => __( 'API Version', 'easy-digital-downloads' ),
+ 'ip' => __( 'Request IP', 'easy-digital-downloads' ),
+ 'speed' => __( 'Request Speed', 'easy-digital-downloads' ),
+ 'date' => __( 'Date', 'easy-digital-downloads' ),
);
}
@@ -66,55 +56,35 @@ protected function get_primary_column_name() {
return 'ID';
}
- /**
- * This function renders most of the columns in the list table.
- *
- * @since 1.5
- *
- * @param array $item Contains all the data of the api request
- * @param string $column_name The name of the column
- *
- * @return string Column Name
- */
- public function column_default( $item, $column_name ) {
- switch ( $column_name ) {
- case 'ip':
- return '
' . esc_html( $item['ip'] ) . '';
- default:
- return $item[ $column_name ];
- }
- }
-
/**
* Output Error Message column
*
* @since 1.5
- * @param array $item Contains all the data of the log
+ * @param array $item Contains all the data of the log.
* @return void
*/
public function column_details( $item ) {
- ?>
+ ?>
+
+
' . __( 'API Request:', 'easy-digital-downloads' ) . '';
- echo '
' . $request . '
';
- if ( ! empty( $error ) ) {
- echo '
' . __( 'Error', 'easy-digital-downloads' ) . '
';
- echo '
' . esc_html( $error ) . '
';
+ if ( ! empty( $item['error'] ) ) {
+ ?>
+
+
+
' . __( 'API User:', 'easy-digital-downloads' ) . '';
- echo '
' . $item['user_id'] . '
';
- echo '
' . __( 'API Key:', 'easy-digital-downloads' ) . '
';
- echo '
' . $item['api_key'] . '
';
- echo '
' . __( 'Request Date:', 'easy-digital-downloads' ) . '
';
- echo '
' . $item['date'] . '
';
?>
+
+
+
+
+
+
- 'log',
- 'plural' => 'logs',
- 'ajax' => false
- ) );
+ parent::__construct(
+ array(
+ 'singular' => 'log',
+ 'plural' => 'logs',
+ 'ajax' => false,
+ )
+ );
$this->filter_bar_hooks();
}
@@ -51,22 +53,25 @@ public function __construct() {
* Removes the referrer nonce from parent class.
*
* @since 3.0.0
- * @param string $which
+ * @param string $which Position of the tablenav: 'top' or 'bottom'.
*/
protected function display_tablenav( $which ) {
- ?>
+ ?>
has_items() ) : ?>
bulk_actions( $which ); ?>
- extra_tablenav( $which );
- $this->pagination( $which ); ?>
+ $this->pagination( $which );
+ ?>
-
+ get_filtered_view(); ?>
+ $current_view = $this->get_filtered_view();
+ ?>
array_values( $sales ),
'earnings' => array_values( $earnings ),
);
+}
+
+/**
+ * The callback function for the Reports Overview Earnings chart.
+ *
+ * @since 3.3.6
+ *
+ * @return array
+ */
+function edd_overview_earnings_chart() {
+ global $wpdb;
+
+ $dates = Reports\get_dates_filter( 'objects' );
+ $chart_dates = Reports\parse_dates_for_range( null, 'now', false );
+ $column = Reports\get_taxes_excluded_filter() ? '(total - tax)' : 'total';
+ $currency = Reports\get_filter_value( 'currencies' );
+ $period = Reports\get_graph_period();
+
+ if ( empty( $currency ) || 'convert' === $currency ) {
+ $column .= ' / rate';
+ }
+
+ $sql_clauses = Reports\get_sql_clauses( $period );
+
+ if ( ! empty( $currency ) && array_key_exists( strtoupper( $currency ), edd_get_currencies() ) ) {
+ $sql_clauses['where'] = $wpdb->prepare( " AND currency = %s ", strtoupper( $currency ) );
+ }
+
+ // Revenue calculations should include gross statuses to negate refunds properly.
+ $statuses = edd_get_gross_order_statuses();
+ $statuses = apply_filters( 'edd_payment_stats_post_statuses', $statuses );
+ $statuses = "'" . implode( "', '", $statuses ) . "'";
+
+ $earnings_results = $wpdb->get_results(
+ $wpdb->prepare(
+ "SELECT SUM({$column}) AS earnings, {$sql_clauses['select']}
+ FROM {$wpdb->edd_orders} edd_o
+ WHERE date_created >= %s AND date_created <= %s
+ AND status IN( {$statuses} )
+ AND type IN ( 'sale', 'refund' )
+ {$sql_clauses['where']}
+ GROUP BY {$sql_clauses['groupby']}
+ ORDER BY {$sql_clauses['orderby']} ASC",
+ $dates['start']->copy()->format( 'mysql' ),
+ $dates['end']->copy()->format( 'mysql' )
+ )
+ );
+
+ $earnings = array();
+
+ /**
+ * Initialise all arrays with timestamps and set values to 0.
+ *
+ * We use the Chart based dates for this loop, so the graph shows in the proper date ranges while the actual DB queries are all UTC based.
+ */
+ while ( strtotime( $chart_dates['start']->copy()->format( 'mysql' ) ) <= strtotime( $chart_dates['end']->copy()->format( 'mysql' ) ) ) {
+ $timestamp = $chart_dates['start']->copy()->format( 'U' );
+ $date_on_chart = $chart_dates['start'];
+
+ $earnings[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
+ $earnings[ $timestamp ][1] = 0.00;
+
+ // Loop through each date there were sales/earnings, which we queried from the database.
+ foreach ( $earnings_results as $earnings_result ) {
+ $date_of_db_value = EDD()->utils->date( $earnings_result->date );
+
+ // Add any sales/earnings that happened during this hour.
+ if ( 'hour' === $period ) {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m-d H' ) === $date_on_chart->format( 'Y-m-d H' ) ) {
+ $earnings[ $timestamp ][1] += $earnings_result->earnings;
+ }
+ // Add any sales/earnings that happened during this day.
+ } elseif ( 'day' === $period ) {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m-d' ) === $date_on_chart->format( 'Y-m-d' ) ) {
+ $earnings[ $timestamp ][1] += $earnings_result->earnings;
+ }
+ // Add any sales/earnings that happened during this month.
+ } else {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m' ) === $date_on_chart->format( 'Y-m' ) ) {
+ $earnings[ $timestamp ][1] += $earnings_result->earnings;
+ }
+ }
+ }
+
+ // Move the chart along to the next hour/day/month to get ready for the next loop.
+ if ( 'hour' === $period ) {
+ $chart_dates['start']->addHour( 1 );
+ } elseif ( 'day' === $period ) {
+ $chart_dates['start']->addDays( 1 );
+ } else {
+ $chart_dates['start']->addMonth( 1 );
+ }
+ }
+ return array(
+ 'earnings' => array_values( $earnings ),
+ );
+}
+
+/**
+ * The callback for the Reports Overview Sales Chart.
+ *
+ * @since 3.3.6
+ *
+ * @return array
+ */
+function edd_overview_sales_chart() {
+ global $wpdb;
+
+ $dates = Reports\get_dates_filter( 'objects' );
+ $chart_dates = Reports\parse_dates_for_range( null, 'now', false );
+ $column = Reports\get_taxes_excluded_filter() ? '(total - tax)' : 'total';
+ $currency = Reports\get_filter_value( 'currencies' );
+ $period = Reports\get_graph_period();
+
+ if ( empty( $currency ) || 'convert' === $currency ) {
+ $column .= ' / rate';
+ }
+
+ $sql_clauses = Reports\get_sql_clauses( $period );
+
+ if ( ! empty( $currency ) && array_key_exists( strtoupper( $currency ), edd_get_currencies() ) ) {
+ $sql_clauses['where'] = $wpdb->prepare( " AND currency = %s ", strtoupper( $currency ) );
+ }
+
+ // Sales counts should count by 'net' statuses, which excludes refunds.
+ $statuses = edd_get_net_order_statuses();
+ $statuses = apply_filters( 'edd_payment_stats_post_statuses', $statuses );
+ $statuses = "'" . implode( "', '", $statuses ) . "'";
+
+ $sales_results = $wpdb->get_results(
+ $wpdb->prepare(
+ "SELECT COUNT(*) AS sales, {$sql_clauses['select']}
+ FROM {$wpdb->edd_orders} edd_o
+ WHERE date_created >= %s AND date_created <= %s
+ AND status IN( {$statuses} )
+ AND type = 'sale'
+ {$sql_clauses['where']}
+ GROUP BY {$sql_clauses['groupby']}
+ ORDER BY {$sql_clauses['orderby']} ASC",
+ $dates['start']->copy()->format( 'mysql' ),
+ $dates['end']->copy()->format( 'mysql' )
+ )
+ );
+
+ $sales = array();
+
+ /**
+ * Initialise all arrays with timestamps and set values to 0.
+ *
+ * We use the Chart based dates for this loop, so the graph shows in the proper date ranges while the actual DB queries are all UTC based.
+ */
+ while ( strtotime( $chart_dates['start']->copy()->format( 'mysql' ) ) <= strtotime( $chart_dates['end']->copy()->format( 'mysql' ) ) ) {
+ $timestamp = $chart_dates['start']->copy()->format( 'U' );
+ $date_on_chart = $chart_dates['start'];
+
+ $sales[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
+ $sales[ $timestamp ][1] = 0;
+
+ // Loop through each date there were sales/earnings, which we queried from the database.
+ foreach ( $sales_results as $sales_result ) {
+ $date_of_db_value = EDD()->utils->date( $sales_result->date );
+
+ // Add any sales/earnings that happened during this hour.
+ if ( 'hour' === $period ) {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m-d H' ) === $date_on_chart->format( 'Y-m-d H' ) ) {
+ $sales[ $timestamp ][1] += $sales_result->sales;
+ }
+ // Add any sales/earnings that happened during this day.
+ } elseif ( 'day' === $period ) {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m-d' ) === $date_on_chart->format( 'Y-m-d' ) ) {
+ $sales[ $timestamp ][1] += $sales_result->sales;
+ }
+ // Add any sales/earnings that happened during this month.
+ } else {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m' ) === $date_on_chart->format( 'Y-m' ) ) {
+ $sales[ $timestamp ][1] += $sales_result->sales;
+ }
+ }
+ }
+
+ // Move the chart along to the next hour/day/month to get ready for the next loop.
+ if ( 'hour' === $period ) {
+ $chart_dates['start']->addHour( 1 );
+ } elseif ( 'day' === $period ) {
+ $chart_dates['start']->addDays( 1 );
+ } else {
+ $chart_dates['start']->addMonth( 1 );
+ }
+ }
+
+ return array(
+ 'sales' => array_values( $sales ),
+ );
}
/**
diff --git a/includes/admin/reporting/reports.php b/includes/admin/reporting/reports.php
index 519e74a295f..cb9a5479b5f 100755
--- a/includes/admin/reporting/reports.php
+++ b/includes/admin/reporting/reports.php
@@ -223,7 +223,8 @@ function edd_register_overview_report( $reports ) {
'overview_refunded_amount',
),
'charts' => array(
- 'overview_sales_earnings_chart',
+ 'overview_earnings_chart',
+ 'overview_sales_chart',
),
),
'filters' => array(
@@ -366,71 +367,69 @@ function edd_register_overview_report( $reports ) {
);
$reports->register_endpoint(
- 'overview_sales_earnings_chart',
+ 'overview_earnings_chart',
array(
- 'label' => __( 'Sales and Earnings', 'easy-digital-downloads' ) . ' — ' . $label . ' — ' . __( 'Net', 'easy-digital-downloads' ),
+ 'label' => __( 'Earnings', 'easy-digital-downloads' ) . ' — ' . $label . ' — ' . __( 'Net', 'easy-digital-downloads' ),
'views' => array(
'chart' => array(
- 'data_callback' => 'edd_overview_sales_earnings_chart',
+ 'data_callback' => 'edd_overview_earnings_chart',
'type' => 'line',
'options' => array(
'datasets' => array(
'earnings' => array(
'label' => __( 'Earnings', 'easy-digital-downloads' ),
'borderColor' => 'rgba(24,126,244,0.75)',
- 'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
- 'borderWidth' => 2,
+ 'backgroundColor' => 'rgba(24,126,244,0.05)',
+ 'fill' => false,
'type' => 'currency',
+ 'borderWidth' => 2,
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'earnings-y',
),
+ ),
+ ),
+ ),
+ ),
+ )
+ );
+
+ $reports->register_endpoint(
+ 'overview_sales_chart',
+ array(
+ 'label' => __( 'Sales', 'easy-digital-downloads' ) . ' — ' . $label . ' — ' . __( 'Net', 'easy-digital-downloads' ),
+ 'views' => array(
+ 'chart' => array(
+ 'data_callback' => 'edd_overview_sales_chart',
+ 'type' => 'line',
+ 'options' => array(
+ 'datasets' => array(
'sales' => array(
'label' => __( 'Sales', 'easy-digital-downloads' ),
'borderColor' => 'rgba(252,108,18,0.75)',
'backgroundColor' => 'rgba(252,108,18,0.05)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
- 'borderCapStyle' => 'round',
- 'borderJoinStyle' => 'round',
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'sales-y',
),
),
'scales' => array(
'yAxes' => array(
array(
- 'id' => 'earnings-y',
- 'type' => 'linear',
- 'display' => true,
- 'position' => 'left',
- 'ticks' => array(
- 'formattingType' => 'format',
- 'beginAtZero' => true,
- 'precision' => 0,
- ),
+ 'type' => 'linear',
+ 'display' => true,
+ 'position' => 'left',
'gridLines' => array(
- 'display' => true,
+ 'drawBorder' => false,
),
- ),
- array(
- 'id' => 'sales-y',
- 'type' => 'linear',
- 'position' => 'right',
- 'display' => true,
- 'ticks' => array(
+ 'ticks' => array(
'formattingType' => 'integer',
- 'beginAtZero' => true,
- 'hideNegativeTicks' => true,
- 'precision' => 0,
- ),
- 'gridLines' => array(
- 'display' => true,
- 'color' => 'rgba(0,0,0,0.03)',
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
@@ -440,6 +439,7 @@ function edd_register_overview_report( $reports ) {
),
)
);
+
} catch ( \EDD_Exception $exception ) {
edd_debug_log_exception( $exception );
}
@@ -496,7 +496,8 @@ function ( $endpoint ) use ( $download_data ) {
array(
'download_sales_by_variations',
'download_earnings_by_variations',
- 'download_sales_earnings_chart',
+ 'download_earnings_chart',
+ 'download_sales_chart',
),
function ( $endpoint ) use ( $download_data, $download ) {
switch ( $endpoint ) {
@@ -777,9 +778,9 @@ function ( $endpoint ) use ( $download_data ) {
);
$reports->register_endpoint(
- 'download_sales_earnings_chart',
+ 'download_earnings_chart',
array(
- 'label' => __( 'Sales and Earnings', 'easy-digital-downloads' ) . esc_html( $download_label ),
+ 'label' => __( 'Earnings', 'easy-digital-downloads' ) . esc_html( $download_label ),
'views' => array(
'chart' => array(
'data_callback' => function () use ( $download_data, $currency ) {
@@ -851,23 +852,6 @@ function ( $endpoint ) use ( $download_data ) {
...$statuses
);
- $sales_sql = $wpdb->prepare(
- "SELECT COUNT(edd_oi.total) AS sales, {$sql_clauses['select']}
- FROM {$wpdb->edd_order_items} edd_oi
- {$join}
- WHERE edd_oi.product_id = %d %1s AND edd_oi.date_created >= %s AND edd_oi.date_created <= %s AND edd_oi.status IN ({$status_string})
- GROUP BY {$sql_clauses['groupby']}
- ORDER BY {$sql_clauses['orderby']} ASC",
- $download_data['download_id'],
- $price_id,
- $dates['start']->copy()->format( 'mysql' ),
- $dates['end']->copy()->format( 'mysql' ),
- ...$statuses
- );
-
- $sales_results = $wpdb->get_results( $sales_sql );
-
- $sales = array();
$earnings = array();
// Initialise all arrays with timestamps and set values to 0.
@@ -875,9 +859,6 @@ function ( $endpoint ) use ( $download_data ) {
$timestamp = $chart_dates['start']->copy()->format( 'U' );
$date_on_chart = $chart_dates['start'];
- $sales[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
- $sales[ $timestamp ][1] = 0;
-
$earnings[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
$earnings[ $timestamp ][1] = 0.00;
@@ -906,6 +887,99 @@ function ( $endpoint ) use ( $download_data ) {
}
}
+ // Move the chart along to the next hour/day/month to get ready for the next loop.
+ if ( 'hour' === $period ) {
+ $chart_dates['start']->addHour( 1 );
+ } elseif ( 'day' === $period ) {
+ $chart_dates['start']->addDays( 1 );
+ } else {
+ $chart_dates['start']->addMonth( 1 );
+ }
+ }
+
+ return array(
+ 'earnings' => array_values( $earnings ),
+ );
+ },
+ 'type' => 'line',
+ 'options' => array(
+ 'datasets' => array(
+ 'earnings' => array(
+ 'label' => __( 'Earnings', 'easy-digital-downloads' ),
+ 'borderColor' => 'rgba(24,126,244,0.75)',
+ 'backgroundColor' => 'rgba(24,126,244,0.1)',
+ 'fill' => false,
+ 'borderWidth' => 2,
+ 'type' => 'currency',
+ 'pointRadius' => 4,
+ 'pointHoverRadius' => 6,
+ 'pointBackgroundColor' => 'rgb(255,255,255)',
+ ),
+ ),
+ ),
+ ),
+ ),
+ )
+ );
+
+ $reports->register_endpoint(
+ 'download_sales_chart',
+ array(
+ 'label' => __( 'Sales', 'easy-digital-downloads' ) . esc_html( $download_label ),
+ 'views' => array(
+ 'chart' => array(
+ 'data_callback' => function () use ( $download_data, $currency ) {
+ global $wpdb;
+
+ $dates = Reports\get_dates_filter( 'objects' );
+ $chart_dates = Reports\parse_dates_for_range( null, 'now', false );
+ $period = Reports\get_graph_period();
+ $sql_clauses = Reports\get_sql_clauses( $period, 'edd_oi.date_created' );
+
+ $union_clauses = array(
+ 'select' => 'date',
+ 'groupby' => 'date',
+ 'orderby' => 'date',
+ );
+
+ $price_id = isset( $download_data['price_id'] ) && is_numeric( $download_data['price_id'] )
+ ? sprintf( 'AND price_id = %d', absint( $download_data['price_id'] ) )
+ : '';
+
+ $statuses = edd_get_net_order_statuses();
+ $status_string = implode( ', ', array_fill( 0, count( $statuses ), '%s' ) );
+
+ $join = $wpdb->prepare(
+ "INNER JOIN {$wpdb->edd_orders} edd_o ON (edd_oi.order_id = edd_o.id) AND edd_o.status IN({$status_string}) AND edd_o.type = 'sale' ",
+ ...$statuses
+ );
+
+ $sales_sql = $wpdb->prepare(
+ "SELECT COUNT(edd_oi.total) AS sales, {$sql_clauses['select']}
+ FROM {$wpdb->edd_order_items} edd_oi
+ {$join}
+ WHERE edd_oi.product_id = %d %1s AND edd_oi.date_created >= %s AND edd_oi.date_created <= %s AND edd_oi.status IN ({$status_string})
+ GROUP BY {$sql_clauses['groupby']}
+ ORDER BY {$sql_clauses['orderby']} ASC",
+ $download_data['download_id'],
+ $price_id,
+ $dates['start']->copy()->format( 'mysql' ),
+ $dates['end']->copy()->format( 'mysql' ),
+ ...$statuses
+ );
+
+ $sales_results = $wpdb->get_results( $sales_sql );
+
+ $sales = array();
+
+ // Initialise all arrays with timestamps and set values to 0.
+ while ( strtotime( $chart_dates['start']->copy()->format( 'mysql' ) ) <= strtotime( $chart_dates['end']->copy()->format( 'mysql' ) ) ) {
+ $timestamp = $chart_dates['start']->copy()->format( 'U' );
+ $date_on_chart = $chart_dates['start'];
+
+ $sales[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
+ $sales[ $timestamp ][1] = 0;
+
// Loop through each date there were sales/earnings, which we queried from the database.
foreach ( $sales_results as $sales_result ) {
$date_of_db_value = EDD()->utils->date( $sales_result->date );
@@ -942,71 +1016,40 @@ function ( $endpoint ) use ( $download_data ) {
}
return array(
- 'earnings' => array_values( $earnings ),
'sales' => array_values( $sales ),
);
},
'type' => 'line',
'options' => array(
'datasets' => array(
- 'earnings' => array(
- 'label' => __( 'Earnings', 'easy-digital-downloads' ),
- 'borderColor' => 'rgba(24,126,244,0.75)',
- 'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
- 'borderWidth' => 2,
- 'type' => 'currency',
- 'pointRadius' => 4,
- 'pointHoverRadius' => 6,
- 'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'earnings-y',
- ),
'sales' => array(
'label' => __( 'Sales', 'easy-digital-downloads' ),
'borderColor' => 'rgba(252,108,18,0.75)',
'backgroundColor' => 'rgba(252,108,18,0.05)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
'borderCapStyle' => 'round',
'borderJoinStyle' => 'round',
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'sales-y',
),
),
'scales' => array(
'yAxes' => array(
array(
- 'id' => 'earnings-y',
- 'type' => 'linear',
- 'display' => true,
- 'position' => 'left',
- 'ticks' => array(
- 'maxTicksLimit' => 5,
- 'formattingType' => 'format',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- ),
+ 'type' => 'linear',
+ 'display' => true,
+ 'position' => 'left',
'gridLines' => array(
- 'display' => true,
+ 'drawBorder' => false,
),
- ),
- array(
- 'id' => 'sales-y',
- 'type' => 'linear',
- 'position' => 'right',
- 'display' => true,
- 'ticks' => array(
- 'maxTicksLimit' => 5,
+ 'ticks' => array(
'formattingType' => 'integer',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'hideNegativeTicks' => true,
- ),
- 'gridLines' => array(
- 'display' => true,
- 'color' => 'rgba(0,0,0,0.03)',
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
@@ -1109,7 +1152,8 @@ function edd_register_refunds_report( $reports ) {
'refund_rate',
),
'charts' => array(
- 'refunds_chart',
+ 'refunds_orders_chart',
+ 'refunds_earnings_chart',
),
),
'filters' => array(
@@ -1297,9 +1341,9 @@ function edd_register_refunds_report( $reports ) {
);
$reports->register_endpoint(
- 'refunds_chart',
+ 'refunds_earnings_chart',
array(
- 'label' => __( 'Refunds', 'easy-digital-downloads' ) . ' — ' . $label,
+ 'label' => __( 'Refunded Revenue', 'easy-digital-downloads' ) . ' — ' . $label,
'views' => array(
'chart' => array(
'data_callback' => 'edd_overview_refunds_chart',
@@ -1307,64 +1351,59 @@ function edd_register_refunds_report( $reports ) {
'options' => array(
'datasets' => array(
'amount' => array(
- 'label' => __( 'Amount', 'easy-digital-downloads' ),
+ 'label' => __( 'Revenue', 'easy-digital-downloads' ),
'borderColor' => 'rgba(24,126,244,0.75)',
'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
'borderWidth' => 2,
'type' => 'currency',
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'amount-y',
),
+ ),
+ ),
+ ),
+ ),
+ )
+ );
+
+ $reports->register_endpoint(
+ 'refunds_orders_chart',
+ array(
+ 'label' => __( 'Refunded Orders', 'easy-digital-downloads' ) . ' — ' . $label,
+ 'views' => array(
+ 'chart' => array(
+ 'data_callback' => 'edd_overview_refunds_chart',
+ 'type' => 'line',
+ 'options' => array(
+ 'datasets' => array(
'number' => array(
'label' => _x( 'Number', 'Context: As in the total number of items', 'easy-digital-downloads' ),
'borderColor' => 'rgba(252,108,18,0.75)',
'backgroundColor' => 'rgba(252,108,18,0.05)',
- 'fill' => true,
'borderWidth' => 2,
'borderCapStyle' => 'round',
'borderJoinStyle' => 'round',
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'number-y',
),
),
'scales' => array(
'yAxes' => array(
array(
- 'id' => 'amount-y',
- 'type' => 'linear',
- 'display' => true,
- 'position' => 'left',
- 'ticks' => array(
- 'maxTicksLimit' => 5,
- 'formattingType' => 'format',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'precision' => 0,
- ),
+ 'type' => 'linear',
+ 'display' => true,
+ 'position' => 'left',
'gridLines' => array(
- 'display' => true,
+ 'drawBorder' => false,
),
- ),
- array(
- 'id' => 'number-y',
- 'type' => 'linear',
- 'position' => 'right',
- 'display' => true,
- 'ticks' => array(
- 'maxTicksLimit' => 5,
+ 'ticks' => array(
'formattingType' => 'integer',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'precision' => 0,
- ),
- 'gridLines' => array(
- 'display' => true,
- 'color' => 'rgba(0,0,0,0.03)',
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
@@ -1396,6 +1435,7 @@ function edd_register_payment_gateways_report( $reports ) {
$exclude_taxes = Reports\get_taxes_excluded_filter();
$currency = Reports\get_filter_value( 'currencies' );
$gateway = Reports\get_filter_value( 'gateways' );
+ $order_status = Reports\get_filter_value( 'order_statuses' );
$hbh = Reports\get_dates_filter_hour_by_hour();
$label = $options[ $dates['range'] ] . ( $hbh ? ' (' . edd_get_timezone_abbr() . ')' : '' );
@@ -1424,11 +1464,13 @@ function ( $endpoint ) use ( $gateway ) {
array(
'gateway_sales_breakdown',
'gateway_earnings_breakdown',
- 'gateway_sales_earnings_chart',
+ 'gateway_earnings_chart',
+ 'gateway_sales_chart',
),
function ( $endpoint ) use ( $gateway ) {
switch ( $endpoint ) {
- case 'gateway_sales_earnings_chart':
+ case 'gateway_earnings_chart':
+ case 'gateway_sales_chart':
return ! empty( $gateway ) && 'all' !== $gateway;
break;
default:
@@ -1448,7 +1490,7 @@ function ( $endpoint ) use ( $gateway ) {
'tables' => $tables,
'charts' => $charts,
),
- 'filters' => array( 'dates', 'gateways', 'taxes', 'currencies' ),
+ 'filters' => array( 'dates', 'gateways', 'order_statuses', 'taxes', 'currencies' ),
)
);
@@ -1458,20 +1500,23 @@ function ( $endpoint ) use ( $gateway ) {
'label' => __( 'Sales', 'easy-digital-downloads' ),
'views' => array(
'tile' => array(
- 'data_callback' => function () use ( $dates, $currency ) {
+ 'data_callback' => function () use ( $dates, $currency, $order_status ) {
$gateway = 'all' !== Reports\get_filter_value( 'gateways' )
? Reports\get_filter_value( 'gateways' )
: '';
$stats = new EDD\Stats();
-
- return $stats->get_gateway_sales(
- array(
- 'range' => $dates['range'],
- 'gateway' => $gateway,
- 'currency' => $currency,
- )
+ $args = array(
+ 'range' => $dates['range'],
+ 'gateway' => $gateway,
+ 'currency' => $currency,
);
+
+ if ( ! empty( $order_status ) ) {
+ $args['status'] = array( $order_status );
+ }
+
+ return $stats->get_gateway_sales( $args );
},
'display_args' => array(
'comparison_label' => $label,
@@ -1487,22 +1532,25 @@ function ( $endpoint ) use ( $gateway ) {
'label' => __( 'Earnings', 'easy-digital-downloads' ),
'views' => array(
'tile' => array(
- 'data_callback' => function () use ( $dates, $exclude_taxes, $currency ) {
+ 'data_callback' => function () use ( $dates, $exclude_taxes, $currency, $order_status ) {
$gateway = 'all' !== Reports\get_filter_value( 'gateways' )
? Reports\get_filter_value( 'gateways' )
: '';
$stats = new EDD\Stats();
-
- return $stats->get_gateway_earnings(
- array(
- 'range' => $dates['range'],
- 'exclude_taxes' => $exclude_taxes,
- 'gateway' => $gateway,
- 'output' => 'formatted',
- 'currency' => $currency,
- )
+ $args = array(
+ 'range' => $dates['range'],
+ 'exclude_taxes' => $exclude_taxes,
+ 'gateway' => $gateway,
+ 'output' => 'formatted',
+ 'currency' => $currency,
);
+
+ if ( ! empty( $order_status ) ) {
+ $args['status'] = array( $order_status );
+ }
+
+ return $stats->get_gateway_earnings( $args );
},
'display_args' => array(
'comparison_label' => $label,
@@ -1518,23 +1566,25 @@ function ( $endpoint ) use ( $gateway ) {
'label' => __( 'Refunds', 'easy-digital-downloads' ),
'views' => array(
'tile' => array(
- 'data_callback' => function () use ( $dates, $currency ) {
+ 'data_callback' => function () use ( $dates, $currency, $order_status ) {
$gateway = 'all' !== Reports\get_filter_value( 'gateways' )
? Reports\get_filter_value( 'gateways' )
: '';
$stats = new EDD\Stats();
-
- return $stats->get_gateway_earnings(
- array(
- 'range' => $dates['range'],
- 'gateway' => $gateway,
- 'output' => 'formatted',
- 'type' => 'refund',
- 'status' => array( 'complete' ),
- 'currency' => $currency,
- )
+ $args = array(
+ 'range' => $dates['range'],
+ 'gateway' => $gateway,
+ 'output' => 'formatted',
+ 'type' => 'refund',
+ 'currency' => $currency,
);
+
+ if ( ! empty( $order_status ) ) {
+ $args['status'] = array( $order_status );
+ }
+
+ return $stats->get_gateway_earnings( $args );
},
'display_args' => array(
'comparison_label' => $label,
@@ -1550,35 +1600,30 @@ function ( $endpoint ) use ( $gateway ) {
'label' => __( 'Average Order Value', 'easy-digital-downloads' ),
'views' => array(
'tile' => array(
- 'data_callback' => function () use ( $dates, $exclude_taxes, $currency ) {
+ 'data_callback' => function () use ( $dates, $exclude_taxes, $currency, $order_status ) {
$gateway = 'all' !== Reports\get_filter_value( 'gateways' )
? Reports\get_filter_value( 'gateways' )
: '';
$stats = new EDD\Stats();
+ $args = array(
+ 'range' => $dates['range'],
+ 'exclude_taxes' => $exclude_taxes,
+ 'function' => 'AVG',
+ 'output' => 'formatted',
+ 'currency' => $currency,
+ );
- if ( empty( $gateway ) ) {
- return $stats->get_order_earnings(
- array(
- 'range' => $dates['range'],
- 'exclude_taxes' => $exclude_taxes,
- 'function' => 'AVG',
- 'output' => 'formatted',
- 'currency' => $currency,
- )
- );
- } else {
- return $stats->get_gateway_earnings(
- array(
- 'range' => $dates['range'],
- 'exclude_taxes' => $exclude_taxes,
- 'gateway' => $gateway,
- 'function' => 'AVG',
- 'output' => 'formatted',
- 'currency' => $currency,
- )
- );
+ if ( ! empty( $order_status ) ) {
+ $args['status'] = array( $order_status );
}
+
+ if ( ! empty( $gateway ) ) {
+ $args['gateway'] = $gateway;
+ return $stats->get_gateway_earnings( $args );
+ }
+
+ return $stats->get_order_earnings( $args );
},
'display_args' => array(
'comparison_label' => $label,
@@ -1625,16 +1670,20 @@ function ( $endpoint ) use ( $gateway ) {
'label' => __( 'Gateway Sales', 'easy-digital-downloads' ) . ' — ' . $options[ $dates['range'] ],
'views' => array(
'chart' => array(
- 'data_callback' => function () use ( $dates, $currency ) {
+ 'data_callback' => function () use ( $dates, $currency, $order_status ) {
$stats = new EDD\Stats();
- $g = $stats->get_gateway_sales(
- array(
- 'range' => $dates['range'],
- 'grouped' => true,
- 'currency' => $currency,
- )
+ $args = array(
+ 'range' => $dates['range'],
+ 'grouped' => true,
+ 'currency' => $currency,
);
+ if ( ! empty( $order_status ) ) {
+ $args['status'] = array( $order_status );
+ }
+
+ $g = $stats->get_gateway_sales( $args );
+
$gateways = array_flip( array_keys( edd_get_payment_gateways() ) );
foreach ( $g as $data ) {
@@ -1682,17 +1731,21 @@ function ( $v ) {
'label' => __( 'Gateway Earnings', 'easy-digital-downloads' ) . ' — ' . $options[ $dates['range'] ],
'views' => array(
'chart' => array(
- 'data_callback' => function () use ( $dates, $exclude_taxes, $currency ) {
+ 'data_callback' => function () use ( $dates, $exclude_taxes, $currency, $order_status ) {
$stats = new EDD\Stats();
- $g = $stats->get_gateway_earnings(
- array(
- 'grouped' => true,
- 'range' => $dates['range'],
- 'exclude_taxes' => $exclude_taxes,
- 'currency' => $currency,
- )
+ $args = array(
+ 'range' => $dates['range'],
+ 'grouped' => true,
+ 'exclude_taxes' => $exclude_taxes,
+ 'currency' => $currency,
);
+ if ( ! empty( $order_status ) ) {
+ $args['status'] = array( $order_status );
+ }
+
+ $g = $stats->get_gateway_earnings( $args );
+
$gateways = array_flip( array_keys( edd_get_payment_gateways() ) );
foreach ( $g as $data ) {
@@ -1738,9 +1791,9 @@ function ( $v ) {
);
$reports->register_endpoint(
- 'gateway_sales_earnings_chart',
+ 'gateway_earnings_chart',
array(
- 'label' => __( 'Sales and Earnings', 'easy-digital-downloads' ) . ' — ' . $label,
+ 'label' => __( 'Earnings', 'easy-digital-downloads' ) . ' — ' . $label,
'views' => array(
'chart' => array(
'data_callback' => function () use ( $dates, $exclude_taxes, $currency ) {
@@ -1766,7 +1819,7 @@ function ( $v ) {
$results = $wpdb->get_results(
$wpdb->prepare(
- "SELECT COUNT({$column}) AS sales, SUM({$column}) AS earnings, {$sql_clauses['select']}
+ "SELECT SUM({$column}) AS earnings, {$sql_clauses['select']}
FROM {$wpdb->edd_orders} o
WHERE gateway = %s AND status IN ('complete', 'revoked') {$currency_sql} AND date_created >= %s AND date_created <= %s
GROUP BY {$sql_clauses['groupby']}
@@ -1777,7 +1830,6 @@ function ( $v ) {
)
);
- $sales = array();
$earnings = array();
/**
@@ -1789,9 +1841,6 @@ function ( $v ) {
$timestamp = $chart_dates['start']->copy()->format( 'U' );
$date_on_chart = $chart_dates['start'];
- $sales[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
- $sales[ $timestamp ][1] = 0;
-
$earnings[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
$earnings[ $timestamp ][1] = 0.00;
@@ -1803,21 +1852,18 @@ function ( $v ) {
if ( 'hour' === $period ) {
// If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
if ( $date_of_db_value->format( 'Y-m-d H' ) === $date_on_chart->format( 'Y-m-d H' ) ) {
- $sales[ $timestamp ][1] += $result->sales;
$earnings[ $timestamp ][1] += $result->earnings;
}
// Add any sales/earnings that happened during this day.
} elseif ( 'day' === $period ) {
// If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
if ( $date_of_db_value->format( 'Y-m-d' ) === $date_on_chart->format( 'Y-m-d' ) ) {
- $sales[ $timestamp ][1] += $result->sales;
$earnings[ $timestamp ][1] += $result->earnings;
}
// Add any sales/earnings that happened during this month.
} else {
// If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
if ( $date_of_db_value->format( 'Y-m' ) === $date_on_chart->format( 'Y-m' ) ) {
- $sales[ $timestamp ][1] += $result->sales;
$earnings[ $timestamp ][1] += $result->earnings;
}
}
@@ -1833,12 +1879,10 @@ function ( $v ) {
}
}
- $sales = array_values( $sales );
$earnings = array_values( $earnings );
return array(
'earnings' => $earnings,
- 'sales' => $sales,
);
},
'type' => 'line',
@@ -1848,62 +1892,146 @@ function ( $v ) {
'label' => __( 'Earnings', 'easy-digital-downloads' ),
'borderColor' => 'rgba(24,126,244,0.75)',
'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
'type' => 'currency',
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'earnings-y',
),
+ ),
+ ),
+ ),
+ ),
+ )
+ );
+
+ $reports->register_endpoint(
+ 'gateway_sales_chart',
+ array(
+ 'label' => __( 'Sales', 'easy-digital-downloads' ) . ' — ' . $label,
+ 'views' => array(
+ 'chart' => array(
+ 'data_callback' => function () use ( $dates, $exclude_taxes, $currency ) {
+ global $wpdb;
+
+ $dates = Reports\get_dates_filter( 'objects' );
+ $chart_dates = Reports\parse_dates_for_range( null, 'now', false );
+ $period = Reports\get_graph_period();
+ $sql_clauses = Reports\get_sql_clauses( $period, 'date_created' );
+
+ $gateway = Reports\get_filter_value( 'gateways' );
+ $column = $exclude_taxes
+ ? '( total - tax ) / rate'
+ : 'total / rate';
+
+ $currency_sql = '';
+ if ( ! empty( $currency ) && array_key_exists( strtoupper( $currency ), edd_get_currencies() ) ) {
+ $currency_sql = $wpdb->prepare(
+ ' AND currency = %s ',
+ strtoupper( $currency )
+ );
+ }
+
+ $results = $wpdb->get_results(
+ $wpdb->prepare(
+ "SELECT COUNT({$column}) AS sales, {$sql_clauses['select']}
+ FROM {$wpdb->edd_orders} o
+ WHERE gateway = %s AND status IN ('complete', 'revoked') {$currency_sql} AND date_created >= %s AND date_created <= %s
+ GROUP BY {$sql_clauses['groupby']}
+ ORDER BY {$sql_clauses['orderby']} ASC",
+ esc_sql( $gateway ),
+ $dates['start']->copy()->format( 'mysql' ),
+ $dates['end']->copy()->format( 'mysql' )
+ )
+ );
+
+ $sales = array();
+
+ /**
+ * Initialise all arrays with timestamps and set values to 0.
+ *
+ * We use the Chart based dates for this loop, so the graph shows in the proper date ranges while the actual DB queries are all UTC based.
+ */
+ while ( strtotime( $chart_dates['start']->copy()->format( 'mysql' ) ) <= strtotime( $chart_dates['end']->copy()->format( 'mysql' ) ) ) {
+ $timestamp = $chart_dates['start']->copy()->format( 'U' );
+ $date_on_chart = $chart_dates['start'];
+
+ $sales[ $timestamp ][0] = $date_on_chart->format( 'Y-m-d H:i:s' );
+ $sales[ $timestamp ][1] = 0;
+
+ // Loop through each date there were sales/earnings, which we queried from the database.
+ foreach ( $results as $result ) {
+ $date_of_db_value = EDD()->utils->date( $result->date );
+
+ // Add any sales/earnings that happened during this hour.
+ if ( 'hour' === $period ) {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m-d H' ) === $date_on_chart->format( 'Y-m-d H' ) ) {
+ $sales[ $timestamp ][1] += $result->sales;
+ }
+ // Add any sales/earnings that happened during this day.
+ } elseif ( 'day' === $period ) {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m-d' ) === $date_on_chart->format( 'Y-m-d' ) ) {
+ $sales[ $timestamp ][1] += $result->sales;
+ }
+ // Add any sales/earnings that happened during this month.
+ } else {
+ // If the date of this db value matches the date on this line graph/chart, set the y axis value for the chart to the number in the DB result.
+ if ( $date_of_db_value->format( 'Y-m' ) === $date_on_chart->format( 'Y-m' ) ) {
+ $sales[ $timestamp ][1] += $result->sales;
+ }
+ }
+ }
+
+ // Move the chart along to the next hour/day/month to get ready for the next loop.
+ if ( 'hour' === $period ) {
+ $chart_dates['start']->addHour( 1 );
+ } elseif ( 'day' === $period ) {
+ $chart_dates['start']->addDays( 1 );
+ } else {
+ $chart_dates['start']->addMonth( 1 );
+ }
+ }
+
+ $sales = array_values( $sales );
+
+ return array(
+ 'sales' => $sales,
+ );
+ },
+ 'type' => 'line',
+ 'options' => array(
+ 'datasets' => array(
'sales' => array(
'label' => __( 'Sales', 'easy-digital-downloads' ),
'borderColor' => 'rgba(252,108,18,0.75)',
'backgroundColor' => 'rgba(252,108,18,0.05)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
'borderCapStyle' => 'round',
'borderJoinStyle' => 'round',
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'sales-y',
),
),
'scales' => array(
'yAxes' => array(
array(
- 'id' => 'earnings-y',
- 'type' => 'linear',
- 'display' => true,
- 'position' => 'left',
- 'ticks' => array(
- 'maxTicksLimit' => 5,
- 'formattingType' => 'format',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'precision' => 0,
- ),
+ 'type' => 'linear',
+ 'display' => true,
+ 'position' => 'left',
'gridLines' => array(
- 'display' => true,
+ 'drawBorder' => false,
),
- ),
- array(
- 'id' => 'sales-y',
- 'type' => 'linear',
- 'position' => 'right',
- 'display' => true,
- 'ticks' => array(
- 'maxTicksLimit' => 5,
+ 'ticks' => array(
'formattingType' => 'integer',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'hideNegativeTicks' => true,
- 'precision' => 0,
- ),
- 'gridLines' => array(
- 'display' => true,
- 'color' => 'rgba(0,0,0,0.03)',
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
@@ -2354,27 +2482,28 @@ function ( $endpoint ) use ( $download_data ) {
'label' => __( 'File Downloads', 'easy-digital-downloads' ),
'borderColor' => 'rgba(24,126,244,0.75)',
'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
'pointRadius' => 4,
'pointHoverRadius' => 6,
'pointBackgroundColor' => 'rgb(255,255,255)',
- 'yAxisID' => 'file-downloads-y',
),
),
'scales' => array(
'yAxes' => array(
array(
- 'id' => 'file-downloads-y',
'type' => 'linear',
'display' => true,
'position' => 'left',
+ 'gridLines' => array(
+ 'drawBorder' => false,
+ ),
'ticks' => array(
- 'maxTicksLimit' => 5,
'formattingType' => 'integer',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'precision' => 0,
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
@@ -2717,7 +2846,7 @@ function ( $table ) use ( $discount ) {
'label' => __( 'Discount Usage', 'easy-digital-downloads' ),
'borderColor' => 'rgba(24,126,244,0.75)',
'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
'pointRadius' => 4,
'pointHoverRadius' => 6,
@@ -2730,12 +2859,15 @@ function ( $table ) use ( $discount ) {
'type' => 'linear',
'display' => true,
'position' => 'left',
+ 'gridLines' => array(
+ 'drawBorder' => false,
+ ),
'ticks' => array(
- 'maxTicksLimit' => 2,
'formattingType' => 'integer',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'precision' => 0,
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
@@ -2970,7 +3102,7 @@ function edd_register_customer_report( $reports ) {
'label' => __( 'New Customers', 'easy-digital-downloads' ),
'borderColor' => 'rgba(24,126,244,0.75)',
'backgroundColor' => 'rgba(24,126,244,0.1)',
- 'fill' => true,
+ 'fill' => false,
'borderWidth' => 2,
'pointRadius' => 4,
'pointHoverRadius' => 6,
@@ -2983,12 +3115,15 @@ function edd_register_customer_report( $reports ) {
'type' => 'linear',
'display' => true,
'position' => 'left',
+ 'gridLines' => array(
+ 'drawBorder' => false,
+ ),
'ticks' => array(
- 'maxTicksLimit' => 5,
'formattingType' => 'integer',
- 'suggestedMin' => 0,
- 'beginAtZero' => true,
- 'precision' => 0,
+ 'beginAtZero' => true,
+ 'suggestedMin' => 0,
+ 'maxTicksLimit' => 4,
+ 'padding' => 10,
),
),
),
diff --git a/includes/admin/settings/register-settings.php b/includes/admin/settings/register-settings.php
index fdd7302a4e2..adc823c8b14 100755
--- a/includes/admin/settings/register-settings.php
+++ b/includes/admin/settings/register-settings.php
@@ -151,28 +151,31 @@ function edd_register_settings() {
}
// Parse args
- $args = wp_parse_args( $option, array(
- 'section' => $section,
- 'id' => null,
- 'desc' => '',
- 'name' => '',
- 'size' => null,
- 'options' => '',
- 'std' => '',
- 'min' => null,
- 'max' => null,
- 'step' => null,
- 'chosen' => null,
- 'multiple' => null,
- 'placeholder' => null,
- 'allow_blank' => true,
- 'readonly' => false,
- 'faux' => false,
- 'tooltip_title' => false,
- 'tooltip_desc' => false,
- 'field_class' => '',
- 'label_for' => false
- ) );
+ $args = wp_parse_args(
+ $option,
+ array(
+ 'section' => $section,
+ 'id' => null,
+ 'desc' => '',
+ 'name' => '',
+ 'size' => null,
+ 'options' => '',
+ 'std' => '',
+ 'min' => null,
+ 'max' => null,
+ 'step' => null,
+ 'chosen' => null,
+ 'multiple' => null,
+ 'placeholder' => null,
+ 'allow_blank' => true,
+ 'readonly' => false,
+ 'faux' => false,
+ 'tooltip_title' => false,
+ 'tooltip_desc' => false,
+ 'field_class' => '',
+ 'label_for' => false,
+ )
+ );
// Callback fallback
$func = 'edd_' . $args['type'] . '_callback';
@@ -230,7 +233,7 @@ function edd_get_registered_settings() {
*
* @since 1.0.8.2
*
- * @param array $input The value inputted in the field
+ * @param array $input The value inputted in the field
*
* @global array $edd_options Array of all the EDD Options
*
@@ -251,7 +254,7 @@ function edd_settings_sanitize( $input = array() ) {
// Pull out the tab and section.
parse_str( $_POST['_wp_http_referer'], $referrer );
- $tab = ! empty( $referrer['tab'] ) ? sanitize_key( $referrer['tab'] ) : 'general';
+ $tab = ! empty( $referrer['tab'] ) ? sanitize_key( $referrer['tab'] ) : 'general';
$section = ! empty( $referrer['section'] ) ? sanitize_key( $referrer['section'] ) : 'main';
if ( ! empty( $_POST['edd_tab_override'] ) ) {
@@ -487,18 +490,21 @@ function edd_sanitize_html_class( $class = '' ) {
* @return array $tabs
*/
function edd_get_settings_tabs() {
- return apply_filters( 'edd_settings_tabs', array(
- 'general' => __( 'General', 'easy-digital-downloads' ),
- 'gateways' => __( 'Payments', 'easy-digital-downloads' ),
- 'emails' => __( 'Emails', 'easy-digital-downloads' ),
- 'marketing' => __( 'Marketing', 'easy-digital-downloads' ),
- 'styles' => __( 'Styles', 'easy-digital-downloads' ),
- 'taxes' => __( 'Taxes', 'easy-digital-downloads' ),
- 'privacy' => __( 'Policies', 'easy-digital-downloads' ),
- 'extensions' => __( 'Extensions', 'easy-digital-downloads' ),
- 'licenses' => __( 'Licenses', 'easy-digital-downloads' ),
- 'misc' => __( 'Misc', 'easy-digital-downloads' ),
- ) );
+ return apply_filters(
+ 'edd_settings_tabs',
+ array(
+ 'general' => __( 'General', 'easy-digital-downloads' ),
+ 'gateways' => __( 'Payments', 'easy-digital-downloads' ),
+ 'emails' => __( 'Emails', 'easy-digital-downloads' ),
+ 'marketing' => __( 'Marketing', 'easy-digital-downloads' ),
+ 'styles' => __( 'Styles', 'easy-digital-downloads' ),
+ 'taxes' => __( 'Taxes', 'easy-digital-downloads' ),
+ 'privacy' => __( 'Policies', 'easy-digital-downloads' ),
+ 'extensions' => __( 'Extensions', 'easy-digital-downloads' ),
+ 'licenses' => __( 'Licenses', 'easy-digital-downloads' ),
+ 'misc' => __( 'Misc', 'easy-digital-downloads' ),
+ )
+ );
}
/**
@@ -513,7 +519,7 @@ function edd_get_settings_tab_sections( $tab = false ) {
if ( $tab && ! empty( $sections[ $tab ] ) ) {
$tabs = $sections[ $tab ];
- } else if ( $tab ) {
+ } elseif ( $tab ) {
$tabs = array();
}
@@ -532,47 +538,74 @@ function edd_get_registered_settings_sections() {
if ( null === $sections ) {
$sections = array(
- 'general' => apply_filters( 'edd_settings_sections_general', array(
- 'main' => __( 'Store', 'easy-digital-downloads' ),
- 'currency' => __( 'Currency', 'easy-digital-downloads' ),
- 'pages' => __( 'Pages', 'easy-digital-downloads' ),
- 'api' => __( 'API', 'easy-digital-downloads' ),
- ) ),
- 'gateways' => apply_filters( 'edd_settings_sections_gateways', array(
- 'main' => __( 'General', 'easy-digital-downloads' ),
- 'checkout' => __( 'Checkout', 'easy-digital-downloads' ),
- 'refunds' => __( 'Refunds', 'easy-digital-downloads' ),
- 'accounting' => __( 'Accounting', 'easy-digital-downloads' ),
- ) ),
- 'emails' => apply_filters( 'edd_settings_sections_emails', array(
- 'main' => __( 'General', 'easy-digital-downloads' ),
- 'email_summaries' => __( 'Summaries', 'easy-digital-downloads' ),
- ) ),
- 'marketing' => apply_filters( 'edd_settings_sections_marketing', array(
- 'main' => __( 'General', 'easy-digital-downloads' ),
- ) ),
- 'styles' => apply_filters( 'edd_settings_sections_styles', array(
- 'main' => __( 'General', 'easy-digital-downloads' ),
- 'buttons' => __( 'Buttons', 'easy-digital-downloads' )
- ) ),
- 'taxes' => apply_filters( 'edd_settings_sections_taxes', array(
- 'main' => __( 'General', 'easy-digital-downloads' ),
- 'rates' => __( 'Rates', 'easy-digital-downloads' ),
- ) ),
- 'privacy' => apply_filters( 'edd_settings_section_privacy', array(
- 'main' => __( 'Privacy Policy', 'easy-digital-downloads' ),
- 'site_terms' => __( 'Terms & Agreements', 'easy-digital-downloads' ),
- 'export_erase' => __( 'Export & Erase', 'easy-digital-downloads' )
- ) ),
- 'extensions' => apply_filters( 'edd_settings_sections_extensions', array(
- 'main' => __( 'Main', 'easy-digital-downloads' )
- ) ),
+ 'general' => apply_filters(
+ 'edd_settings_sections_general',
+ array(
+ 'main' => __( 'Store', 'easy-digital-downloads' ),
+ 'currency' => __( 'Currency', 'easy-digital-downloads' ),
+ 'pages' => __( 'Pages', 'easy-digital-downloads' ),
+ 'api' => __( 'API', 'easy-digital-downloads' ),
+ )
+ ),
+ 'gateways' => apply_filters(
+ 'edd_settings_sections_gateways',
+ array(
+ 'main' => __( 'General', 'easy-digital-downloads' ),
+ 'checkout' => __( 'Checkout', 'easy-digital-downloads' ),
+ 'refunds' => __( 'Refunds', 'easy-digital-downloads' ),
+ 'accounting' => __( 'Accounting', 'easy-digital-downloads' ),
+ )
+ ),
+ 'emails' => apply_filters(
+ 'edd_settings_sections_emails',
+ array(
+ 'main' => __( 'General', 'easy-digital-downloads' ),
+ 'email_summaries' => __( 'Summaries', 'easy-digital-downloads' ),
+ )
+ ),
+ 'marketing' => apply_filters(
+ 'edd_settings_sections_marketing',
+ array(
+ 'main' => __( 'General', 'easy-digital-downloads' ),
+ )
+ ),
+ 'styles' => apply_filters(
+ 'edd_settings_sections_styles',
+ array(
+ 'main' => __( 'General', 'easy-digital-downloads' ),
+ 'buttons' => __( 'Buttons', 'easy-digital-downloads' ),
+ )
+ ),
+ 'taxes' => apply_filters(
+ 'edd_settings_sections_taxes',
+ array(
+ 'main' => __( 'General', 'easy-digital-downloads' ),
+ 'rates' => __( 'Rates', 'easy-digital-downloads' ),
+ )
+ ),
+ 'privacy' => apply_filters(
+ 'edd_settings_section_privacy',
+ array(
+ 'main' => __( 'Privacy Policy', 'easy-digital-downloads' ),
+ 'site_terms' => __( 'Terms & Agreements', 'easy-digital-downloads' ),
+ 'export_erase' => __( 'Export & Erase', 'easy-digital-downloads' ),
+ )
+ ),
+ 'extensions' => apply_filters(
+ 'edd_settings_sections_extensions',
+ array(
+ 'main' => __( 'Main', 'easy-digital-downloads' ),
+ )
+ ),
'licenses' => apply_filters( 'edd_settings_sections_licenses', array() ),
- 'misc' => apply_filters( 'edd_settings_sections_misc', array(
- 'main' => __( 'General', 'easy-digital-downloads' ),
- 'button_text' => __( 'Purchase Buttons', 'easy-digital-downloads' ),
- 'file_downloads' => __( 'File Downloads', 'easy-digital-downloads' ),
- ) )
+ 'misc' => apply_filters(
+ 'edd_settings_sections_misc',
+ array(
+ 'main' => __( 'General', 'easy-digital-downloads' ),
+ 'button_text' => __( 'Purchase Buttons', 'easy-digital-downloads' ),
+ 'file_downloads' => __( 'File Downloads', 'easy-digital-downloads' ),
+ )
+ ),
);
}
@@ -653,10 +686,10 @@ function edd_checkbox_callback( $args ) {
$args['label'] = wp_kses_post( $args['desc'] );
$args['value'] = 1;
- $html = '
';
- $html .= '
';
- $html .= EDD()->html->checkbox( $args );
- $html .= '
';
+ $html = '
';
+ $html .= '
';
+ $html .= EDD()->html->checkbox( $args );
+ $html .= '
';
echo apply_filters( 'edd_after_setting_output', $html, $args );
}
@@ -722,7 +755,7 @@ function edd_multicheck_callback( $args ) {
if ( ! empty( $args['options'] ) ) {
$html .= '
';
- foreach ( $args['options'] as $key => $option ):
+ foreach ( $args['options'] as $key => $option ) :
if ( isset( $edd_option[ $key ] ) ) {
$enabled = $option;
} else {
@@ -768,12 +801,15 @@ function edd_payment_icons_callback( $args = array() ) {
$class = edd_sanitize_html_class( $args['field_class'] );
// Everything is wrapped in a sortable UL
- ?>
+ ?>
+
- $option ) :
+ $option ) :
$enabled = isset( $edd_option[ $key ] )
? $option
- : null; ?>
+ : null;
+ ?>
-
';
}
@@ -1067,7 +1107,7 @@ function edd_text_callback( $args ) {
: '';
$disabled = ! empty( $args['disabled'] ) ? ' disabled="disabled"' : '';
- $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
+ $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
$html = '';
$html .= ' ' . wp_kses_post( $args['desc'] ) . '
';
@@ -1126,42 +1166,44 @@ function edd_email_callback( $args ) {
* Renders number fields.
*
* @since 1.9
- *
- * @param array $args Arguments passed by the setting
- *
+ * @param array $args Arguments passed by the setting.
* @return void
*/
function edd_number_callback( $args ) {
- $edd_option = edd_get_option( $args['id'] );
-
- if ( is_numeric( $edd_option ) ) {
- $value = $edd_option;
- } else {
- $value = isset( $args['std'] ) ? $args['std'] : '';
+ $class = isset( $args['size'] ) ? $args['size'] : 'regular';
+ $class .= '-text';
+ if ( ! empty( $args['field_class'] ) ) {
+ $class .= ' ' . $args['field_class'];
}
-
+ $number_args = array(
+ 'value' => edd_get_option( $args['id'], $args['std'] ),
+ 'desc' => $args['desc'],
+ 'id' => 'edd_settings[' . esc_attr( $args['id'] ) . ']',
+ 'name' => 'edd_settings[' . esc_attr( $args['id'] ) . ']',
+ 'class' => $class,
+ 'readonly' => ! empty( $args['readonly'] ),
+ 'disabled' => ! empty( $args['disabled'] ),
+ 'placeholder' => ! empty( $args['placeholder'] ) ? $args['placeholder'] : '',
+ );
if ( isset( $args['faux'] ) && true === $args['faux'] ) {
- $args['readonly'] = true;
- $value = isset( $args['std'] ) ? $args['std'] : '';
- $name = '';
- } else {
- $name = 'name="edd_settings[' . esc_attr( $args['id'] ) . ']"';
+ $number_args['readonly'] = true;
+ $number_args['name'] = '';
}
+ if ( isset( $args['min'] ) ) {
+ $number_args['min'] = $args['min'];
+ }
+ if ( isset( $args['max'] ) ) {
+ $number_args['max'] = $args['max'];
+ }
+ if ( isset( $args['step'] ) ) {
+ $number_args['step'] = $args['step'];
+ }
+ if ( isset( $args['datalist'] ) ) {
+ $number_args['datalist'] = $args['datalist'];
+ }
+ $number = new EDD\HTML\Number( $number_args );
- $class = edd_sanitize_html_class( $args['field_class'] );
-
- $max = isset( $args['max'] ) ? $args['max'] : 999999;
- $min = isset( $args['min'] ) ? $args['min'] : 0;
- $step = isset( $args['step'] ) ? $args['step'] : 1;
-
- $readonly = ! empty( $args['readonly'] ) ? ' readonly' : '';
- $disabled = ! empty( $args['disabled'] ) ? ' disabled="disabled"' : '';
-
- $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
- $html = '';
- $html .= ' ' . wp_kses_post( $args['desc'] ) . '
';
-
- echo apply_filters( 'edd_after_setting_output', $html, $args );
+ echo apply_filters( 'edd_after_setting_output', $number->get(), $args );
}
/**
@@ -1331,7 +1373,7 @@ function edd_color_select_callback( $args ) {
foreach ( $args['options'] as $option => $color ) {
$selected = selected( $option, $value, false );
- $html .= '';
+ $html .= '';
}
$html .= '';
@@ -1368,11 +1410,15 @@ function edd_rich_editor_callback( $args ) {
ob_start();
- wp_editor( stripslashes( $value ), 'edd_settings_' . esc_attr( $args['id'] ), array(
- 'textarea_name' => 'edd_settings[' . esc_attr( $args['id'] ) . ']',
- 'textarea_rows' => absint( $rows ),
- 'editor_class' => $class,
- ) );
+ wp_editor(
+ stripslashes( $value ),
+ 'edd_settings_' . esc_attr( $args['id'] ),
+ array(
+ 'textarea_name' => 'edd_settings[' . esc_attr( $args['id'] ) . ']',
+ 'textarea_rows' => absint( $rows ),
+ 'editor_class' => $class,
+ )
+ );
if ( ! empty( $args['desc'] ) ) {
echo '' . wp_kses_post( $args['desc'] ) . '
';
@@ -1504,7 +1550,7 @@ function edd_tax_rate_callback( $args ) {
* @param array $args Arguments passed by the setting
* @return void
*/
-function edd_recapture_callback($args) {
+function edd_recapture_callback( $args ) {
$client_connected = false;
if ( class_exists( 'RecaptureEDD' ) ) {
@@ -1553,7 +1599,7 @@ function edd_recapture_callback($args) {
- $rates,
- 'nonce' => wp_create_nonce( 'edd-country-field-nonce' ),
- 'i18n' => array(
- /* translators: Tax rate country code */
- 'duplicateRate' => esc_html__( 'Duplicate tax rates are not allowed. Please deactivate the existing %s tax rate before adding or activating another.', 'easy-digital-downloads' ),
- 'emptyCountry' => esc_html__( 'Please select a country.', 'easy-digital-downloads' ),
- 'negativeTax' => esc_html__( 'Please enter a tax rate greater than 0.', 'easy-digital-downloads' ),
- 'emptyTax' => esc_html__( 'Are you sure you want to add a 0% tax rate?', 'easy-digital-downloads' ),
- ),
- ) );
+ wp_localize_script(
+ 'edd-admin-tax-rates',
+ 'eddTaxRates',
+ array(
+ 'rates' => $rates,
+ 'nonce' => wp_create_nonce( 'edd-country-field-nonce' ),
+ 'i18n' => array(
+ /* translators: Tax rate country code */
+ 'duplicateRate' => esc_html__( 'Duplicate tax rates are not allowed. Please deactivate the existing %s tax rate before adding or activating another.', 'easy-digital-downloads' ),
+ 'emptyCountry' => esc_html__( 'Please select a country.', 'easy-digital-downloads' ),
+ 'negativeTax' => esc_html__( 'Please enter a tax rate greater than 0.', 'easy-digital-downloads' ),
+ 'emptyTax' => esc_html__( 'Are you sure you want to add a 0% tax rate?', 'easy-digital-downloads' ),
+ ),
+ )
+ );
$templates = array(
'meta',
'row',
'row-empty',
'add',
- 'bulk-actions'
+ 'bulk-actions',
);
echo '
' . $args['desc'] . '
';
foreach ( $templates as $tmpl ) {
-?>
+ ?>
-get();
@@ -1742,7 +1791,7 @@ function edd_set_settings_cap() {
*
* @since 1.9
* @param string $html
- * @param type $args
+ * @param type $args
* @return string
*/
function edd_add_setting_tooltip( $html = '', $args = array() ) {
@@ -1833,17 +1882,22 @@ function edd_is_test_mode_forced() {
* Checks for an incorrect setting for the privacy policy.
* Required in updating from EDD 2.9.2 to 2.9.3.
*/
-add_filter( 'edd_get_option_show_privacy_policy_on_checkout', function( $value ) {
- if ( ! empty( $value ) ) {
- return $value;
- }
- $fix_show_privacy_policy_setting = edd_get_option( 'show_agree_to_privacy_policy_on_checkout', false );
- if ( ! empty( $fix_show_privacy_policy_setting ) ) {
- edd_update_option( 'show_privacy_policy_on_checkout', $fix_show_privacy_policy_setting );
- edd_delete_option( 'show_agree_to_privacy_policy_on_checkout' );
+add_filter(
+ 'edd_get_option_show_privacy_policy_on_checkout',
+ function ( $value ) {
+ if ( ! empty( $value ) ) {
+ return $value;
+ }
+ $fix_show_privacy_policy_setting = edd_get_option( 'show_agree_to_privacy_policy_on_checkout', false );
+ if ( ! empty( $fix_show_privacy_policy_setting ) ) {
+ edd_update_option( 'show_privacy_policy_on_checkout', $fix_show_privacy_policy_setting );
+ edd_delete_option( 'show_agree_to_privacy_policy_on_checkout' );
- return $fix_show_privacy_policy_setting;
- }
+ return $fix_show_privacy_policy_setting;
+ }
- return $value;
-}, 10, 3 );
+ return $value;
+ },
+ 10,
+ 3
+);
diff --git a/includes/admin/tools/class-edd-tools-recount-single-customer-stats.php b/includes/admin/tools/class-edd-tools-recount-single-customer-stats.php
index a508853b8a5..175c5dab432 100644
--- a/includes/admin/tools/class-edd-tools-recount-single-customer-stats.php
+++ b/includes/admin/tools/class-edd-tools-recount-single-customer-stats.php
@@ -4,14 +4,14 @@
*
* This class handles batch processing of recounting a single customer's stats
*
- * @subpackage Admin/Tools/EDD_Tools_Recount_Customer_Stats
- * @copyright Copyright (c) 2015, Chris Klosowski
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since 2.5
+ * @package EDD\Admin\Tools\EDD_Tools_Recount_Customer_Stats
+ * @copyright Copyright (c) 2015, Sandhills Development, LLC
+ * @license https://opensource.org/licenses/gpl-2.0.php GNU Public License
+ * @since 2.5
*/
-// Exit if accessed directly
-defined( 'ABSPATH' ) || exit;
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
/**
* EDD_Tools_Recount_Stats Class
@@ -22,6 +22,7 @@ class EDD_Tools_Recount_Single_Customer_Stats extends EDD_Batch_Export {
/**
* Our export type. Used for export-type specific filters/actions
+ *
* @var string
* @since 2.5
*/
@@ -29,6 +30,7 @@ class EDD_Tools_Recount_Single_Customer_Stats extends EDD_Batch_Export {
/**
* Allows for a non-download batch processing to be run.
+ *
* @since 2.5
* @var boolean
*/
@@ -36,11 +38,19 @@ class EDD_Tools_Recount_Single_Customer_Stats extends EDD_Batch_Export {
/**
* Sets the number of items to pull on each step
+ *
* @since 2.5
* @var integer
*/
public $per_step = 10;
+ /**
+ * The customer ID to recount stats for.
+ *
+ * @var int
+ */
+ private $customer_id;
+
/**
* Get the Export Data
*
@@ -51,7 +61,7 @@ class EDD_Tools_Recount_Single_Customer_Stats extends EDD_Batch_Export {
*/
public function get_data() {
- $customer = new EDD_Customer( $this->customer_id );
+ $customer = edd_get_customer( $this->customer_id );
if ( $customer ) {
$customer->recalculate_stats();
$this->result_data = array(
@@ -62,7 +72,6 @@ public function get_data() {
}
return false;
-
}
/**
@@ -96,7 +105,7 @@ public function get_percentage_complete() {
* Set the properties specific to the payments export
*
* @since 2.5
- * @param array $request The Form Data passed into the batch processing
+ * @param array $request The Form Data passed into the batch processing.
*/
public function set_properties( $request ) {
$this->customer_id = isset( $request['customer_id'] ) ? sanitize_text_field( $request['customer_id'] ) : false;
@@ -126,6 +135,11 @@ public function process_step() {
return false;
}
+ /**
+ * Set the headers for the export.
+ *
+ * @return void
+ */
public function headers() {
edd_set_time_limit();
}
@@ -137,8 +151,6 @@ public function headers() {
* @return void
*/
public function export() {
-
- // Set headers
$this->headers();
edd_die();
diff --git a/includes/ajax-functions.php b/includes/ajax-functions.php
index c0a4a644ea0..426448e9d56 100755
--- a/includes/ajax-functions.php
+++ b/includes/ajax-functions.php
@@ -11,8 +11,8 @@
* @since 1.0
*/
-// Exit if accessed directly
-defined( 'ABSPATH' ) || exit;
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
/**
* Checks whether AJAX is enabled.
@@ -46,7 +46,7 @@ function edd_is_ajax_disabled() {
*/
function edd_test_ajax_works() {
- // Check if the Airplane Mode plugin is installed
+ // Check if the Airplane Mode plugin is installed.
if ( class_exists( 'Airplane_Mode_Core' ) ) {
$airplane = Airplane_Mode_Core::getInstance();
@@ -54,7 +54,6 @@ function edd_test_ajax_works() {
if ( $airplane->enabled() ) {
return true;
}
-
} else {
if ( $airplane->check_status() == 'on' ) {
return true;
@@ -69,13 +68,16 @@ function edd_test_ajax_works() {
}
$works = true;
- $ajax = wp_safe_remote_post( esc_url_raw( edd_get_ajax_url() ), array(
- 'sslverify' => false,
- 'timeout' => 30,
- 'body' => array(
- 'action' => 'edd_test_ajax'
+ $ajax = wp_safe_remote_post(
+ esc_url_raw( edd_get_ajax_url() ),
+ array(
+ 'sslverify' => false,
+ 'timeout' => 30,
+ 'body' => array(
+ 'action' => 'edd_test_ajax',
+ ),
)
- ) );
+ );
if ( is_wp_error( $ajax ) ) {
$works = false;
@@ -111,7 +113,7 @@ function edd_test_ajax_works() {
*
* @since 1.3
* @return string URL to the AJAX file to call during AJAX requests.
-*/
+ */
function edd_get_ajax_url() {
$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
@@ -138,7 +140,6 @@ function edd_ajax_remove_from_cart() {
if ( isset( $_POST['cart_item'] ) && isset( $_POST['nonce'] ) ) {
-
$cart_item = absint( $_POST['cart_item'] );
$nonce = sanitize_text_field( $_POST['nonce'] );
@@ -169,7 +170,7 @@ function edd_ajax_remove_from_cart() {
}
edd_die();
}
-add_action( 'wp_ajax_edd_remove_from_cart', 'edd_ajax_remove_from_cart' );
+add_action( 'wp_ajax_edd_remove_from_cart', 'edd_ajax_remove_from_cart' );
add_action( 'wp_ajax_nopriv_edd_remove_from_cart', 'edd_ajax_remove_from_cart' );
/**
@@ -183,7 +184,7 @@ function edd_ajax_add_to_cart() {
edd_die();
}
- $download_id = absint( $_POST['download_id'] );
+ $download_id = absint( $_POST['download_id'] );
$request_validated = false;
if ( isset( $_POST['timestamp'] ) && isset( $_POST['token'] ) && EDD\Utils\Tokenizer::is_token_valid( $_POST['token'], $_POST['timestamp'] ) ) {
$request_validated = true;
@@ -218,9 +219,9 @@ function edd_ajax_add_to_cart() {
$options = array();
}
- if ( isset( $options['price_id'] ) && isset( $post_data['edd_download_quantity_' . $options['price_id'] ] ) ) {
+ if ( isset( $options['price_id'] ) && isset( $post_data[ 'edd_download_quantity_' . $options['price_id'] ] ) ) {
- $options['quantity'] = absint( $post_data['edd_download_quantity_' . $options['price_id'] ] );
+ $options['quantity'] = absint( $post_data[ 'edd_download_quantity_' . $options['price_id'] ] );
} else {
@@ -243,7 +244,7 @@ function edd_ajax_add_to_cart() {
'subtotal' => html_entity_decode( edd_currency_filter( edd_format_amount( edd_get_cart_subtotal() ) ), ENT_COMPAT, 'UTF-8' ),
'total' => html_entity_decode( edd_currency_filter( edd_format_amount( edd_get_cart_total() ) ), ENT_COMPAT, 'UTF-8' ),
'cart_item' => $items,
- 'cart_quantity' => html_entity_decode( edd_get_cart_quantity() )
+ 'cart_quantity' => html_entity_decode( edd_get_cart_quantity() ),
);
if ( edd_use_taxes() ) {
@@ -256,7 +257,7 @@ function edd_ajax_add_to_cart() {
echo json_encode( $return );
edd_die();
}
-add_action( 'wp_ajax_edd_add_to_cart', 'edd_ajax_add_to_cart' );
+add_action( 'wp_ajax_edd_add_to_cart', 'edd_ajax_add_to_cart' );
add_action( 'wp_ajax_nopriv_edd_add_to_cart', 'edd_ajax_add_to_cart' );
/**
@@ -269,7 +270,7 @@ function edd_ajax_get_subtotal() {
echo edd_currency_filter( edd_get_cart_subtotal() );
edd_die();
}
-add_action( 'wp_ajax_edd_get_subtotal', 'edd_ajax_get_subtotal' );
+add_action( 'wp_ajax_edd_get_subtotal', 'edd_ajax_get_subtotal' );
add_action( 'wp_ajax_nopriv_edd_get_subtotal', 'edd_ajax_get_subtotal' );
/**
@@ -307,7 +308,7 @@ function edd_ajax_apply_discount() {
$return = array(
'msg' => 'valid',
'amount' => $amount,
- 'total_plain' => $total,
+ 'total_plain' => edd_format_amount( $total, true, '', 'data' ),
'total' => html_entity_decode( edd_currency_filter( edd_format_amount( $total ) ), ENT_COMPAT, 'UTF-8' ),
'code' => $discount_code,
'html' => edd_get_cart_discounts_html( $discounts ),
@@ -319,7 +320,7 @@ function edd_ajax_apply_discount() {
edd_unset_error( 'edd-discount-error' );
}
- // Allow for custom discount code handling
+ // Allow for custom discount code handling.
$return = apply_filters( 'edd_ajax_discount_response', $return );
echo wp_json_encode( $return );
@@ -327,7 +328,7 @@ function edd_ajax_apply_discount() {
edd_die();
}
-add_action( 'wp_ajax_edd_apply_discount', 'edd_ajax_apply_discount' );
+add_action( 'wp_ajax_edd_apply_discount', 'edd_ajax_apply_discount' );
add_action( 'wp_ajax_nopriv_edd_apply_discount', 'edd_ajax_apply_discount' );
/**
@@ -362,14 +363,14 @@ function edd_ajax_update_cart_item_quantity() {
'complete_purchase' => edd_get_checkout_button_purchase_label(),
);
- // Allow for custom cart item quantity handling
+ // Allow for custom cart item quantity handling.
$return = apply_filters( 'edd_ajax_cart_item_quantity_response', $return );
- echo json_encode($return);
+ echo json_encode( $return );
}
edd_die();
}
-add_action( 'wp_ajax_edd_update_quantity', 'edd_ajax_update_cart_item_quantity' );
+add_action( 'wp_ajax_edd_update_quantity', 'edd_ajax_update_cart_item_quantity' );
add_action( 'wp_ajax_nopriv_edd_update_quantity', 'edd_ajax_update_cart_item_quantity' );
/**
@@ -386,7 +387,7 @@ function edd_ajax_remove_discount() {
$total = edd_get_cart_total();
$return = array(
- 'total_plain' => $total,
+ 'total_plain' => edd_format_amount( $total, true, '', 'data' ),
'total' => html_entity_decode( edd_currency_filter( edd_format_amount( $total ) ), ENT_COMPAT, 'UTF-8' ),
'code' => sanitize_text_field( $_POST['code'] ),
'discounts' => edd_get_cart_discounts(),
@@ -405,7 +406,7 @@ function edd_ajax_remove_discount() {
}
edd_die();
}
-add_action( 'wp_ajax_edd_remove_discount', 'edd_ajax_remove_discount' );
+add_action( 'wp_ajax_edd_remove_discount', 'edd_ajax_remove_discount' );
add_action( 'wp_ajax_nopriv_edd_remove_discount', 'edd_ajax_remove_discount' );
/**
@@ -426,14 +427,14 @@ function edd_load_checkout_login_fields() {
edd_die();
}
-add_action('wp_ajax_nopriv_checkout_login', 'edd_load_checkout_login_fields');
+add_action( 'wp_ajax_nopriv_checkout_login', 'edd_load_checkout_login_fields' );
/**
* Load Checkout Register Fields via AJAX
*
* @since 1.0
* @return void
-*/
+ */
function edd_load_checkout_register_fields() {
$action = sanitize_text_field( $_POST['action'] );
$nonce = sanitize_text_field( $_POST['nonce'] );
@@ -446,7 +447,7 @@ function edd_load_checkout_register_fields() {
edd_die();
}
-add_action('wp_ajax_nopriv_checkout_register', 'edd_load_checkout_register_fields');
+add_action( 'wp_ajax_nopriv_checkout_register', 'edd_load_checkout_register_fields' );
/**
* Get Download Title via AJAX
@@ -472,7 +473,7 @@ function edd_ajax_get_download_title() {
}
edd_die();
}
-add_action( 'wp_ajax_edd_get_download_title', 'edd_ajax_get_download_title' );
+add_action( 'wp_ajax_edd_get_download_title', 'edd_ajax_get_download_title' );
add_action( 'wp_ajax_nopriv_edd_get_download_title', 'edd_ajax_get_download_title' );
/**
@@ -486,7 +487,7 @@ function edd_ajax_recalculate_taxes() {
edd_debug_log( __( 'Missing nonce when recalculating taxes. Please read the following for more information: https://easydigitaldownloads.com/development/2018/07/05/important-update-to-ajax-requests-in-easy-digital-downloads-2-9-4', 'easy-digital-downloads' ), true );
}
- $nonce = isset( $_POST['nonce'] ) ? sanitize_text_field( $_POST['nonce'] ) : '';
+ $nonce = isset( $_POST['nonce'] ) ? sanitize_text_field( $_POST['nonce'] ) : '';
$nonce_verified = wp_verify_nonce( $nonce, 'edd-checkout-address-fields' );
if ( false === $nonce_verified ) {
@@ -505,6 +506,7 @@ function edd_ajax_recalculate_taxes() {
edd_checkout_cart();
/**
* Allows the cart content to be filtered.
+ *
* @since 3.1
*/
$cart = apply_filters( 'edd_get_checkout_cart', ob_get_clean() );
@@ -522,7 +524,7 @@ function edd_ajax_recalculate_taxes() {
edd_die();
}
-add_action( 'wp_ajax_edd_recalculate_taxes', 'edd_ajax_recalculate_taxes' );
+add_action( 'wp_ajax_edd_recalculate_taxes', 'edd_ajax_recalculate_taxes' );
add_action( 'wp_ajax_nopriv_edd_recalculate_taxes', 'edd_ajax_recalculate_taxes' );
/**
@@ -552,13 +554,13 @@ function edd_ajax_get_states_field() {
// Get country.
$country = ! empty( $_POST['country'] )
- ? sanitize_text_field( $_POST['country'] ) // Exactly matched
+ ? sanitize_text_field( $_POST['country'] ) // Exactly matched.
: edd_get_shop_country();
// Get states for country.
$states = edd_get_shop_states( $country );
- // Chosen
+ // Chosen.
$chosen = ! isset( $_POST['chosen'] ) || ( 'true' === $_POST['chosen'] )
? true
: false;
@@ -591,7 +593,7 @@ function edd_ajax_get_states_field() {
edd_die();
}
-add_action( 'wp_ajax_edd_get_shop_states', 'edd_ajax_get_states_field' );
+add_action( 'wp_ajax_edd_get_shop_states', 'edd_ajax_get_states_field' );
add_action( 'wp_ajax_nopriv_edd_get_shop_states', 'edd_ajax_get_states_field' );
/**
@@ -620,8 +622,8 @@ function edd_ajax_download_search() {
function edd_ajax_customer_search() {
global $wpdb;
- $search = esc_sql( sanitize_text_field( $_GET['s'] ) );
- $results = array();
+ $search = esc_sql( sanitize_text_field( $_GET['s'] ) );
+ $results = array();
$customer_view_role = apply_filters( 'edd_view_customers_role', 'view_shop_reports' );
if ( ! current_user_can( $customer_view_role ) ) {
$customers = array();
@@ -632,26 +634,25 @@ function edd_ajax_customer_search() {
} else {
$where = "WHERE `name` LIKE '%$search%' OR `email` LIKE '%$search%' ";
}
- $limit = "LIMIT 50";
+ $limit = 'LIMIT 50';
$customers = $wpdb->get_results( $select . $where . $limit );
}
if ( $customers ) {
- foreach( $customers as $customer ) {
+ foreach ( $customers as $customer ) {
$results[] = array(
'id' => $customer->id,
- 'name' => $customer->name . '(' . $customer->email . ')'
+ 'name' => $customer->name . '(' . $customer->email . ')',
);
}
-
} else {
$customers[] = array(
'id' => 0,
- 'name' => __( 'No results found', 'easy-digital-downloads' )
+ 'name' => __( 'No results found', 'easy-digital-downloads' ),
);
}
@@ -709,33 +710,35 @@ function edd_ajax_download_category_search() {
*/
function edd_ajax_user_search() {
- // Default results
+ // Default results.
$results = array(
'id' => 0,
- 'name' => __( 'No users found', 'easy-digital-downloads' )
+ 'name' => __( 'No users found', 'easy-digital-downloads' ),
);
- // Default user role
+ // Default user role.
$user_view_role = apply_filters( 'edd_view_users_role', 'view_shop_reports' );
- // User can view users
+ // User can view users.
if ( current_user_can( $user_view_role ) ) {
$search = esc_sql( sanitize_text_field( $_GET['s'] ) );
$users = array();
- // Searching
+ // Searching.
if ( ! empty( $search ) ) {
- $users = get_users( array(
- 'search' => '*' . $search . '*',
- 'number' => 50
- ) );
+ $users = get_users(
+ array(
+ 'search' => '*' . $search . '*',
+ 'number' => 50,
+ )
+ );
}
- // Setup results based on users
+ // Setup results based on users.
if ( ! empty( $users ) ) {
$results = array();
- foreach( $users as $user ) {
+ foreach ( $users as $user ) {
$results[] = array(
'id' => $user->ID,
'name' => $user->display_name,
@@ -770,7 +773,7 @@ function edd_check_for_download_price_variations() {
$download_id = intval( $_POST['download_id'] );
$download = get_post( $download_id );
- if ( 'download' != $download->post_type ) {
+ if ( 'download' !== $download->post_type ) {
die( '-2' );
}
@@ -780,13 +783,13 @@ function edd_check_for_download_price_variations() {
if ( ! empty( $variable_prices ) ) {
$ajax_response = '
';
echo $ajax_response;
@@ -805,48 +808,48 @@ function edd_check_for_download_price_variations() {
*/
function edd_ajax_search_users() {
- // Bail if user cannot manage shop settings
+ // Bail if user cannot manage shop settings.
if ( ! current_user_can( 'manage_shop_settings' ) ) {
die();
}
- // To search for
+ // To search for.
$search_query = ! empty( $_POST['user_name'] )
? trim( $_POST['user_name'] )
: '';
- // To exclude
+ // To exclude.
$exclude = ! empty( $_POST['exclude'] )
? trim( $_POST['exclude'] )
: '';
- // Default args
+ // Default args.
$defaults = array(
'number' => 50,
- 'search' => $search_query . '*'
+ 'search' => $search_query . '*',
);
- // Maybe exclude users
+ // Maybe exclude users.
if ( ! empty( $exclude ) ) {
- $exclude_array = explode( ',', $exclude );
+ $exclude_array = explode( ',', $exclude );
$defaults['exclude'] = $exclude_array;
}
- // Filter query args
+ // Filter query args.
$get_users_args = apply_filters( 'edd_search_users_args', $defaults );
- // Maybe get users
+ // Maybe get users.
$users = ! empty( $get_users_args ) && ! empty( $search_query )
? get_users( $get_users_args )
: array();
- // Filter users
+ // Filter users.
$found_users = apply_filters( 'edd_ajax_found_users', $users, $search_query );
- // Put together the results string
+ // Put together the results string.
$user_list = '