Changeset 3090863

Timestamp:

05/22/2024 12:02:23 PM (20 months ago)

Author:

brainfleck

Message:

Added default columns

Location:

wc-order-analytics-add-on

Files:

• tags/1.0.0/includes/admin/class-oa-addon-admin-main.php (modified) (1 diff)
• tags/1.0.0/includes/admin/pages/report-orders/class-oa-addon-report-orders.php (modified) (1 diff)
• trunk/bfs-wc-extend-reports.php (modified) (2 diffs)
• trunk/includes/admin/class-oa-addon-admin-main.php (modified) (1 diff)
• trunk/includes/admin/pages/report-orders/class-oa-addon-report-orders.php (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)

wc-order-analytics-add-on/tags/1.0.0/includes/admin/class-oa-addon-admin-main.php

@@ -86 +86 @@
     public static function get_order_meta_keys() {
         global $wpdb;
-        $meta_keys = $wpdb->get_col( "SELECT DISTINCT(meta_key) FROM wp_wc_orders_meta WHERE order_id IN (SELECT ID FROM wp_posts WHERE post_type = 'shop_order_placehold')" );
+
+        $meta_keys = array('billing_address', 'shipping_address', 'email_address');
+
+        $db_meta_keys = $wpdb->get_col("SELECT DISTINCT(meta_key) FROM {$wpdb->prefix}wc_orders_meta WHERE order_id IN (SELECT ID FROM {$wpdb->prefix}posts WHERE post_type = 'shop_order_placehold')");
+
+        $meta_keys = array_merge($meta_keys, $db_meta_keys);
+        
         return $meta_keys;
     }

wc-order-analytics-add-on/tags/1.0.0/includes/admin/pages/report-orders/class-oa-addon-report-orders.php

@@ -64 +64 @@
 
         }
+        $billing_address = $order->get_formatted_billing_address();
+        $billing_address = str_replace( '<br/>', "\n", $billing_address );
+
+        $shipping_address = $order->get_formatted_shipping_address();
+        $shipping_address = str_replace( '<br/>', "\n", $shipping_address );
+
+        $response->data['billing_address'] = $billing_address;
+        $response->data['shipping_address'] = $shipping_address;
+        $response->data['email_address'] = $order->get_billing_email();
         return $response;
     }

wc-order-analytics-add-on/trunk/bfs-wc-extend-reports.php

@@ -4 +4 @@
  * Plugin URI: 
  * Description: Include a personalized column within the WC Analytics report.
- * Version: 1.0.0
+ * Version: 1.0.1
  * Requires at least: 6.3
  * Tested up to: 6.4
@@ -34 +34 @@
 
 define( 'WCOAA_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
-define( 'WCOAA_VERSION', '1.0.0' );
+define( 'WCOAA_VERSION', '1.0.1' );
 define( 'WCOAA_TEMPLATE_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) . '/templates/' );
 define( 'WCOAA_PLUGIN_PATH', untrailingslashit( plugins_url( basename( plugin_dir_path( __FILE__ ) ), basename( __FILE__ ) ) ) );

wc-order-analytics-add-on/trunk/includes/admin/class-oa-addon-admin-main.php

@@ -86 +86 @@
     public static function get_order_meta_keys() {
         global $wpdb;
-        $meta_keys = $wpdb->get_col( "SELECT DISTINCT(meta_key) FROM wp_wc_orders_meta WHERE order_id IN (SELECT ID FROM wp_posts WHERE post_type = 'shop_order_placehold')" );
+
+        $meta_keys = array('billing_address', 'shipping_address', 'email_address');
+
+        $db_meta_keys = $wpdb->get_col("SELECT DISTINCT(meta_key) FROM {$wpdb->prefix}wc_orders_meta WHERE order_id IN (SELECT ID FROM {$wpdb->prefix}posts WHERE post_type = 'shop_order_placehold')");
+
+        $meta_keys = array_merge($meta_keys, $db_meta_keys);
+        
         return $meta_keys;
     }

wc-order-analytics-add-on/trunk/includes/admin/pages/report-orders/class-oa-addon-report-orders.php

@@ -64 +64 @@
 
         }
+        $billing_address = $order->get_formatted_billing_address();
+        $billing_address = str_replace( '<br/>', "\n", $billing_address );
+
+        $shipping_address = $order->get_formatted_shipping_address();
+        $shipping_address = str_replace( '<br/>', "\n", $shipping_address );
+
+        $response->data['billing_address'] = $billing_address;
+        $response->data['shipping_address'] = $shipping_address;
+        $response->data['email_address'] = $order->get_billing_email();
         return $response;
     }

wc-order-analytics-add-on/trunk/readme.txt

@@ -4 +4 @@
 Tested up to: 6.4
 Requires PHP: 7.4
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: GPLv2