Merge branch 'release/1.2.0'

Author: rvola

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.2.0](https://github.com/rvola/woo-stripe-fee-in-report/tree/1.2.0) - 2019-03-08
+[Full Changelog](https://github.com/rvola/woo-stripe-fee-in-report/compare/1.1.4...1.2.0)
+* Add data to CSV export
+* ✔ Check compatbility WP 5.1
+* FIX / url GitHub
+
 ## [1.1.4](https://github.com/rvola/woo-stripe-fee-in-report/tree/1.1.4) - 2018-10-22
 [Full Changelog](https://github.com/rvola/woo-stripe-fee-in-report/compare/1.1.3...1.1.4)
 

includes/class-report.php

@@ -394,6 +394,124 @@ function () {
                     }
                 );
 
+	            jQuery( '.export_csv' ).click( function() {
+		            var exclude_series = jQuery( this ).data( 'exclude_series' ) || '';
+		            exclude_series    = exclude_series.toString();
+		            exclude_series    = exclude_series.split( ',' );
+		            var xaxes_label   = jQuery( this ).data( 'xaxes' );
+		            var groupby       = jQuery( this ) .data( 'groupby' );
+		            var index_type    = jQuery( this ).data( 'index_type' );
+		            var export_format = jQuery( this ).data( 'export' );
+		            var csv_data      = 'data:text/csv;charset=utf-8,\uFEFF';
+		            var s, series_data, d;
+
+		            if ( 'table' === export_format ) {
+
+			            jQuery( this ).offsetParent().find( 'thead tr,tbody tr' ).each( function() {
+				            jQuery( this ).find( 'th, td' ).each( function() {
+					            var value = jQuery( this ).text();
+					            value = value.replace( '[?]', '' ).replace( '#', '' );
+					            csv_data += '"' + value + '"' + ',';
+				            });
+				            csv_data = csv_data.substring( 0, csv_data.length - 1 );
+				            csv_data += '\n';
+			            });
+
+			            jQuery( this ).offsetParent().find( 'tfoot tr' ).each( function() {
+				            jQuery( this ).find( 'th, td' ).each( function() {
+					            var value = jQuery( this ).text();
+					            value = value.replace( '[?]', '' ).replace( '#', '' );
+					            csv_data += '"' + value + '"' + ',';
+					            if ( jQuery( this ).attr( 'colspan' ) > 0 ) {
+						            for ( i = 1; i < jQuery(this).attr('colspan'); i++ ) {
+							            csv_data += '"",';
+						            }
+					            }
+				            });
+				            csv_data = csv_data.substring( 0, csv_data.length - 1 );
+				            csv_data += '\n';
+			            });
+
+		            } else {
+
+			            if ( ! window.main_chart ) {
+				            return false;
+			            }
+
+			            var the_series = stripe_main_char.getData();
+			            var series     = [];
+			            csv_data      += '"' + xaxes_label + '",';
+
+			            jQuery.each( the_series, function( index, value ) {
+				            if ( ! exclude_series || jQuery.inArray( index.toString(), exclude_series ) === -1 ) {
+					            series.push( value );
+				            }
+			            });
+
+			            // CSV Headers
+			            for ( s = 0; s < series.length; ++s ) {
+				            csv_data += '"' + series[s].label + '",';
+			            }
+
+			            csv_data = csv_data.substring( 0, csv_data.length - 1 );
+			            csv_data += '\n';
+
+			            // Get x axis values
+			            var xaxis = {};
+
+			            for ( s = 0; s < series.length; ++s ) {
+				            series_data = series[s].data;
+				            for ( d = 0; d < series_data.length; ++d ) {
+					            xaxis[series_data[d][0]] = [];
+					            // Zero values to start
+					            for ( var i = 0; i < series.length; ++i ) {
+						            xaxis[series_data[d][0]].push(0);
+					            }
+				            }
+			            }
+
+			            // Add chart data
+			            for ( s = 0; s < series.length; ++s ) {
+				            series_data = series[s].data;
+				            for ( d = 0; d < series_data.length; ++d ) {
+					            xaxis[series_data[d][0]][s] = series_data[d][1];
+				            }
+			            }
+
+			            // Loop data and output to csv string
+			            jQuery.each( xaxis, function( index, value ) {
+				            var date = new Date( parseInt( index, 10 ) );
+
+				            if ( 'none' === index_type ) {
+					            csv_data += '"' + index + '",';
+				            } else {
+					            if ( groupby === 'day' ) {
+						            csv_data += '"' + date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '-' + date.getUTCDate() + '",';
+					            } else {
+						            csv_data += '"' + date.getUTCFullYear() + '-' + parseInt( date.getUTCMonth() + 1, 10 ) + '",';
+					            }
+				            }
+
+				            for ( var d = 0; d < value.length; ++d ) {
+					            var val = value[d];
+
+					            if ( Math.round( val ) !== val ) {
+						            val = parseFloat( val );
+						            val = val.toFixed( 2 );
+					            }
+
+					            csv_data += '"' + val + '",';
+				            }
+				            csv_data = csv_data.substring( 0, csv_data.length - 1 );
+				            csv_data += '\n';
+			            } );
+		            }
+
+		            // Set data as href and return
+		            jQuery( this ).attr( 'href', encodeURI( csv_data ) );
+		            return true;
+	            });
+
             });
         </script>
 		<?php

readme.txt

@@ -4,8 +4,8 @@ Donate link: https://www.paypal.me/rvola
 Tags: stripe, woocommerce, woocommerce-plugin, woocommerce-extension, wordpress-plugin, wordpress, chart, reporting, report, stripe-payments, stripe-gateway
 Requires PHP: 7.0
 Requires at least: 4.4
-Tested up to: 5.0
-Stable tag: 1.1.4
+Tested up to: 5.1
+Stable tag: 1.2.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -41,6 +41,11 @@ The GIT repository is available here [https://github.com/rvola/woo-stripe-fee-in
 
 == Changelog ==
 
+= 1.2.0 / 2019-03-08 =
+* Add data to CSV export
+* ✔ Check compatbility WP 5.1
+* FIX / url GitHub
+
 = 1.1.4 / 2018-10-22 =
 * End support PHP 5.6
 * ✔︎ Check compatbility WP 5.0

woo-stripe-fee-in-report.php

@@ -5,8 +5,8 @@
  *
  * Description:             Shows Stripe fees in WooCommerce charts. Calculates a correct net total.
  *
- * Version:                 1.1.4
- * Revision:                2018-10-22
+ * Version:                 1.2.0
+ * Revision:                2019-03-08
  * Creation:                2018-02-24
  *
  * Author:                  studio RVOLA