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

Fixed report dates Closes #2206.

This commit is contained in:
Mike Jolley 2013-01-10 16:27:18 +00:00
parent 2e223d8509
commit 8baa368ffa
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/woocommerce-admin-reports.php
View File

@ -2423,8 +2423,7 @@ function woocommerce_category_sales() {
$first_year = $wpdb->get_var( "SELECT post_date FROM $wpdb->posts WHERE post_date != 0 ORDER BY post_date ASC LIMIT 1;" ); $first_year = $wpdb->get_var( "SELECT post_date FROM $wpdb->posts WHERE post_date != 0 ORDER BY post_date ASC LIMIT 1;" );
$first_year = ( $first_year ) ? date( 'Y', strtotime( $first_year ) ) : date( 'Y' ); $first_year = ( $first_year ) ? date( 'Y', strtotime( $first_year ) ) : date( 'Y' );
$current_year = isset( $_POST['show_year'] ) ? $_POST['show_year'] : date( 'Y', current_time( 'timestamp' ) ); $current_year = isset( $_POST['show_year'] ) ? $_POST['show_year'] : date( 'Y', current_time( 'timestamp' ) );
$start_date = strtotime( $current_year . '0101' );
$categories = get_terms( 'product_cat', array( 'orderby' => 'name' ) ); $categories = get_terms( 'product_cat', array( 'orderby' => 'name' ) );
?> ?>
@ -2461,8 +2460,6 @@ function woocommerce_category_sales() {
$item_sales = array(); $item_sales = array();
// Get order items // Get order items
$start_date = date( 'Ym', strtotime( date( 'Ym', strtotime( '-1 year', $start_date ) ) . '01' ) );
$order_items = apply_filters( 'woocommerce_reports_category_sales_order_items', $wpdb->get_results( $wpdb->prepare( " $order_items = apply_filters( 'woocommerce_reports_category_sales_order_items', $wpdb->get_results( $wpdb->prepare( "
SELECT order_item_meta_2.meta_value as product_id, posts.post_date, SUM( order_item_meta.meta_value ) as line_total SELECT order_item_meta_2.meta_value as product_id, posts.post_date, SUM( order_item_meta.meta_value ) as line_total
FROM {$wpdb->prefix}woocommerce_order_items as order_items FROM {$wpdb->prefix}woocommerce_order_items as order_items
@ -2478,13 +2475,13 @@ function woocommerce_category_sales() {
AND posts.post_status = 'publish' AND posts.post_status = 'publish'
AND tax.taxonomy = 'shop_order_status' AND tax.taxonomy = 'shop_order_status'
AND term.slug IN ('" . implode( "','", apply_filters( 'woocommerce_reports_order_statuses', array( 'completed', 'processing', 'on-hold' ) ) ) . "') AND term.slug IN ('" . implode( "','", apply_filters( 'woocommerce_reports_order_statuses', array( 'completed', 'processing', 'on-hold' ) ) ) . "')
AND date_format(posts.post_date,'%%Y%%m') >= %s AND date_format(posts.post_date,'%%Y') = %s
AND order_items.order_item_type = 'line_item' AND order_items.order_item_type = 'line_item'
AND order_item_meta.meta_key = '_line_total' AND order_item_meta.meta_key = '_line_total'
AND order_item_meta_2.meta_key = '_product_id' AND order_item_meta_2.meta_key = '_product_id'
GROUP BY order_items.order_id GROUP BY order_items.order_id
ORDER BY posts.post_date ASC ORDER BY posts.post_date ASC
", $start_date ) ) ); ", $current_year ) ) );
if ( $order_items ) { if ( $order_items ) {
foreach ( $order_items as $order_item ) { foreach ( $order_items as $order_item ) {