Merge branch 'release/1.1.2'

Author: rvola

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.1.2](https://github.com/rvola/woo-stripe-fee-in-report/tree/1.1.2) - 2018-06-04
+[Full Changelog](https://github.com/rvola/woo-stripe-fee-in-report/compare/1.1.1...1.1.2)
+
+* Fix - Error in calculating net total #2
+
 ## [1.1.1](https://github.com/rvola/woo-stripe-fee-in-report/tree/1.1.1) - 2018-05-23
 [Full Changelog](https://github.com/rvola/woo-stripe-fee-in-report/compare/1.1.0...1.1.1)
 

includes/class-report.php

@@ -137,7 +137,7 @@ public function add_report_data( $report_data ) {
 		$this->report_data->total_stripe_fees = wc_format_decimal( array_sum( wp_list_pluck( $this->report_data->stripe_fees, 'total' ) ), 2 );
 
 		// Update Net Sale - Stripe fees.
-		$this->report_data->net_sales = wc_format_decimal( $this->report_data->total_sales - $this->report_data->total_shipping - $this->report_data->total_stripe_fees - max( 0, $this->report_data->total_tax ) - max( 0, $this->report_data->total_shipping_tax ) - max( 0, $this->report_data->total_stripe_fees ), 2 );
+		$this->report_data->net_sales = wc_format_decimal( $this->report_data->total_sales - $this->report_data->total_shipping - max( 0, $this->report_data->total_tax ) - max( 0, $this->report_data->total_shipping_tax ) - max( 0, $this->report_data->total_stripe_fees ), 2 );
 
 		return $this->report_data;
 	}

readme.txt

@@ -5,7 +5,7 @@ Tags: stripe, woocommerce, woocommerce-plugin, woocommerce-extension, wordpress-
 Requires PHP: 5.3
 Requires at least: 4.4
 Tested up to: 4.9
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -41,6 +41,9 @@ The GIT repository is available here [https://github.com/rvola/woo-stripe-fee-in
 
 == Changelog ==
 
+= 1.1.2 / 2018-06-04 =
+* Fix - Error in calculating net total #2
+
 = 1.1.1 / 2018-05-23 =
 * ✔︎ Compatibility WooCommerce 3.4.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.1
- * Revision:                2018-05-23
+ * Version:                 1.1.2
+ * Revision:                2018-06-04
  * Creation:                2018-02-24
  *
  * Author:                  studio RVOLA