Changeset 1189764

Timestamp:

06/29/2015 05:52:10 PM (10 years ago)

Author:

chuckmac

Message:

Fix issues with report count in WC 2.3

Location:

woocommerce-sales-by-location-report/trunk

Files:

• changelog.txt (modified) (1 diff)
• classes/class-wc-report-sales-by-location.php (modified) (3 diffs)
• woocommerce-location-report.php (modified) (4 diffs)

woocommerce-sales-by-location-report/trunk/changelog.txt

@@ -1 +1 @@
 *** WooCommerce Sales By Location Report Changelog ***
+
+2015.XX.XX - Version 1.2
+* Fix - Fix order total reporting issue with WooCommerce 2.3
 
 2015.01.11 - Version 1.1.1

woocommerce-sales-by-location-report/trunk/classes/class-wc-report-sales-by-location.php

@@ -17 +17 @@
     public $totals_by;
 
+    private $report_data;
+
+
+    /**
+     * Get report data
+     * @return array
+     */
+    public function get_report_data() {
+        if ( empty( $this->report_data ) ) {
+            $this->query_report_data();
+        }
+        return $this->report_data;
+    }
+
+    /**
+     * Get all data needed for this report and store in the class
+     */
+    private function query_report_data() {
+
+        $this->report_data = new stdClass;
+
+        $this->report_data->orders = (array) $this->get_order_report_data( array(
+            'data' => array(
+                '_' . $this->location_by . '_country' => array(
+                    'type'     => 'meta',
+                    'name'     => 'countries_data',
+                    'function' => null
+                ),
+                '_order_total' => array(
+                    'type'     => 'meta',
+                    'function' => 'SUM',
+                    'name'     => 'total_sales'
+                ),
+                'post_date' => array(
+                    'type'     => 'post_data',
+                    'function' => '',
+                    'name'     => 'post_date'
+                ),
+            ),
+            'group_by'            => 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date), meta__' . $this->location_by . '_country.meta_value',
+            'order_by'            => 'post_date ASC',
+            'query_type'          => 'get_results',
+            'filter_range'        => true,
+            'order_types'         => array_merge( array( 'shop_order_refund' ), wc_get_order_types( 'sales-reports' ) ),
+            'order_status'        => array( 'completed', 'processing', 'on-hold' ),
+            'parent_order_status' => array( 'completed', 'processing', 'on-hold' ),
+        ) );
+
+        $this->report_data->order_counts = (array) $this->get_order_report_data( array(
+            'data' => array(
+                '_' . $this->location_by . '_country' => array(
+                    'type'     => 'meta',
+                    'name'     => 'countries_data',
+                    'function' => null
+                ),
+                'ID' => array(
+                    'type'     => 'post_data',
+                    'function' => 'COUNT',
+                    'name'     => 'count',
+                    'distinct' => true,
+                ),
+                'post_date' => array(
+                    'type'     => 'post_data',
+                    'function' => '',
+                    'name'     => 'post_date'
+                )
+            ),
+            'group_by'            => 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date), meta__' . $this->location_by . '_country.meta_value',
+            'order_by'            => 'post_date ASC',
+            'query_type'          => 'get_results',
+            'filter_range'        => true,
+            'order_types'         => wc_get_order_types( 'order-count' ),
+            'order_status'        => array( 'completed', 'processing', 'on-hold' )
+        ) );
+
+    }
+
     /**
      * Get the legend for the main chart sidebar
@@ -28 +105 @@
         $this->totals_by     = ( isset($_REQUEST['report_by']) ? $_REQUEST['report_by'] : 'number-orders' );
 
+
+        $data = $this->get_report_data();
+
         add_filter( 'woocommerce_reports_get_order_report_query', array( $this, 'location_report_add_count' ) );
-
-        $location_query = $this->get_order_report_data( array(
-                'data' => array(
-                    '_' . $this->location_by . '_country' => array(
-                        'type'     => 'meta',
-                        'name'     => 'countries_data',
-                        'function' => null
-                    ),
-                    '_order_total' => array(
-                        'type'     => 'meta',
-                        'function' => 'SUM',
-                        'name'     => 'total_sales'
-                    ),
-                    'post_date' => array(
-                        'type'     => 'post_data',
-                        'function' => '',
-                        'name'     => 'post_date'
-                    ),
-                ),
-                'filter_range' => true,
-                'group_by' => 'YEAR(posts.post_date), MONTH(posts.post_date), DAY(posts.post_date), meta__' . $this->location_by . '_country.meta_value',
-                'query_type' => 'get_results'
-            ) );
 
 
@@ -57 +114 @@
         $country_data = array();
         $export_data = array();
-        foreach ( $location_query as $location_values ) {
-
-            if ( '' == $location_values->countries_data ) {
-                $location_values->countries_data = 'UNDEFINED';
+
+        if ( 'number-orders' == $this->totals_by ) {
+            foreach ( $data->order_counts as $location_values ) {
+                if ( '' == $location_values->countries_data ) {
+                    $location_values->countries_data = 'UNDEFINED';
+                }
+            
+                $country_data[$location_values->countries_data] = ( isset( $country_data[$location_values->countries_data] ) ) ? $location_values->count + $country_data[$location_values->countries_data] : $location_values->count;
+
+                if ( 'UNDEFINED' != $location_values->countries_data ) {
+                    $export_data[$location_values->countries_data][] = $location_values;
+                }
             }
-
-            if ( 'number-orders' == $this->totals_by ) {
-                $country_data[$location_values->countries_data] = ( isset( $country_data[$location_values->countries_data] ) ) ? $location_values->countries_data_count + $country_data[$location_values->countries_data] : $location_values->countries_data_count;
-            } elseif ( 'order-total' == $this->totals_by ) {
+        } elseif ( 'order-total' == $this->totals_by ) {
+            foreach ( $data->orders as $location_values ) {
+    
+                if ( '' == $location_values->countries_data ) {
+                    $location_values->countries_data = 'UNDEFINED';
+                }
+                    
                 $country_data[$location_values->countries_data] = ( isset( $country_data[$location_values->countries_data] ) ) ? $location_values->total_sales + $country_data[$location_values->countries_data] : $location_values->total_sales;
+    
+                if ( 'UNDEFINED' != $location_values->countries_data ) {
+                    $export_data[$location_values->countries_data][] = $location_values;
+                }
             }
-
-            if ( 'UNDEFINED' != $location_values->countries_data ) {
-                $export_data[$location_values->countries_data][] = $location_values;
-            }
-        }
+        }
+
 
         //Pass the data to the screen.

woocommerce-sales-by-location-report/trunk/woocommerce-location-report.php

@@ -6 +6 @@
  * Author: Chuck Mac
  * Author URI: http://www.chuckmac.info
- * Version: 1.1
+ * Version: 1.2
  * Text Domain: wc_location_report
  * Domain Path: /languages/
  *
- * Copyright: (c) 2014 ChuckMac Development LLC
+ * Copyright: (c) 2014-2015 ChuckMac Development LLC
  *
  * License: GNU General Public License v3.0
@@ -18 +18 @@
  * @author    WooThemes
  * @category  Reports
- * @copyright Copyright (c) 2014, ChuckMac Development LLC
+ * @copyright Copyright (c) 2014-2015, ChuckMac Development LLC
  * @license   http://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3.0
  */
@@ -45 +45 @@
 
     /** plugin version number */
-    public static $version = '1.1';
+    public static $version = '1.2';
 
     /** @var string the plugin file */
@@ -95 +95 @@
             //jVector includes - needs to be done in the footer so we can localize data as part of the report generation
             wp_enqueue_script( 'jvectormap', plugins_url( '/lib/jquery-jvectormap-1.2.2.min.js', self::$plugin_file ), array( 'jquery' ), self::$version, true );
-            wp_enqueue_script( 'jvectormap-world', plugins_url( '/lib/map-data/jquery-jvectormap-world-mill-en.js', self::$plugin_file ), array( 'jquery', 'jvectormap' ), self::$version, true );
+            wp_enqueue_script( 'jvectormap-world', plugins_url( '/lib/map-data/jquery-jvectormap-world-mill-en', self::$plugin_file ), array( 'jquery', 'jvectormap' ), self::$version, true );
 
             //jVector css