Merge branch 'release/1.2.2'

Author: rvola

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.2.2](https://github.com/rvola/woo-stripe-fee-in-report/tree/1.2.2) - 2019-10-23
+[Full Changelog](https://github.com/rvola/woo-stripe-fee-in-report/compare/1.2.1...1.2.2)
+
+* FIX / Load languages files
+* escape i18n
+* FIX / Series incorrect for legend + escape i18n
+* ✔︎ Compatibility WOO 3.8
+* ✔︎ Compatibility WP 5.3
+
 ## [1.2.1](https://github.com/rvola/woo-stripe-fee-in-report/tree/1.2.1) - 2019-04-03
 [Full Changelog](https://github.com/rvola/woo-stripe-fee-in-report/compare/1.2.0...1.2.1)
 

includes/class-report.php

@@ -195,9 +195,8 @@ public function chart_add_legend() {
 			return;
 		}
 		$link = sprintf(
-			'<li style="border-color: %1$s" class="highlight_series" data-series="%2$d">%3$s</li>',
+			'<li style="border-color: %s" class="highlight_series" data-series="9">%s</li>',
 			self::COLOR,
-			$this->get_serie( 'stripe_fees' ),
 			sprintf(
 			    // translators: %s is Stripe fees.
 				_x( '%s Stripe fees', 'number', 'woo-stripe-fee-in-report' ),
@@ -214,30 +213,14 @@ public function chart_add_legend() {
 
 	}
 
-	/**
-	 * Retrieves the key number of the table to add the values to the chart.
-	 *
-	 * @param string $name The name of the key to search for.
-	 *
-	 * @return int
-	 */
-	private function get_serie( $name ) {
-		if ( ! $this->chart_data ) {
-			return false;
-		}
-
-		return array_search( $name, array_keys( $this->chart_data ), true ) - 1;
-	}
-
 	/**
 	 * Replaces hover text for legend.
 	 * In our case, I use it to change the text concerning the net commands taking into account the Stripes fees.
 	 */
 	public function chart_update_legend_placeholder() {
 		$update_legend = array(
-			$this->get_serie( 'net_order_amounts' ) => __( 'This is the sum of the order totals after any refunds and excluding shipping, taxes and Stripe fees.', 'woo-stripe-fee-in-report' ),
+			7 => esc_html__( 'This is the sum of the order totals after any refunds and excluding shipping, taxes and Stripe fees.', 'woo-stripe-fee-in-report' ), // Net sales amount
 		);
-
 		echo '<script type="text/javascript">';
 		foreach ( $update_legend as $serie => $text ) {
 			printf(
@@ -301,7 +284,7 @@ public function chart_draw() {
 
                     // Stripe serie.
                     var stripe_series = {
-                        label: "<?php echo esc_js( __( 'Stripe fees', 'woo-stripe-fee-in-report' ) ) ?>",
+                        label: "<?php echo esc_js( esc_html__( 'Stripe fees', 'woo-stripe-fee-in-report' ) ) ?>",
                         data: <?php echo $stripe_fees;?>,
                         yaxis: 3,
                         color: '<?php echo self::COLOR; ?>',

includes/class-wp.php

@@ -55,8 +55,7 @@ public static function instance() {
 	 */
 	public function load_languages() {
 
-		load_plugin_textdomain( 'woo-stripe-fee-in-report', false, dirname( __FILE__ ) . '/languages' );
-		load_plugin_textdomain( 'woo-stripe-fee-in-report', false, plugin_basename( WOOSFR_FILE ) . '/languages' );
+		load_plugin_textdomain( 'woo-stripe-fee-in-report', false, plugin_basename( dirname( WOOCAO_FILE ) ) . '/languages' );
 	}
 
 	/**
@@ -73,7 +72,7 @@ public function plugin_row_meta( $plugin_meta, $plugin_file ) {
 				$plugin_meta,
 				sprintf(
 					'<a href="https://www.paypal.me/rvola" target="_blank">%s</a>',
-					__( 'Donate', 'woo-stripe-fee-in-report' )
+					esc_html__( 'Donate', 'woo-stripe-fee-in-report' )
 				)
 			);
 		}

languages/woo-stripe-fee-in-report.pot

@@ -1,41 +1,31 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Stripe fee in Report - 1.1.X\n"
-"POT-Creation-Date: 2018-03-20 11:31+0100\n"
+"Project-Id-Version: WooCommerce Stripe fee in Report - 1.2.X\n"
+"POT-Creation-Date: 2019-10-23 13:56+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: \n"
-"X-Generator: Poedit 2.0.6\n"
-"X-Poedit-KeywordsList: __;_e;_x:1,2c\n"
+"X-Generator: Poedit 2.2.4\n"
+"X-Poedit-KeywordsList: esc_html__\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ..\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: includes/class-report.php:203
-#, php-format
-msgctxt "number"
-msgid "%s Stripe fees"
-msgstr ""
-
-#: includes/class-report.php:238
+#: includes/class-report.php:222
 msgid ""
 "This is the sum of the order totals after any refunds and excluding "
 "shipping, taxes and Stripe fees."
 msgstr ""
 
-#: includes/class-report.php:295
-msgid "Shipping amount"
-msgstr ""
-
-#: includes/class-report.php:304
+#: includes/class-report.php:287
 msgid "Stripe fees"
 msgstr ""
 
-#: includes/class-wp.php:76
+#: includes/class-wp.php:75
 msgid "Donate"
 msgstr ""

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.2
-Stable tag: 1.2.1
+Tested up to: 5.3
+Stable tag: 1.2.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -41,6 +41,13 @@ The GIT repository is available here [https://github.com/rvola/woo-stripe-fee-in
 
 == Changelog ==
 
+= 1.2.2 / 2019-10-23 =
+* FIX / Load languages files
+* escape i18n
+* FIX / Series incorrect for legend + escape i18n
+* ✔︎ Compatibility WOO 3.8
+* ✔︎ Compatibility WP 5.3
+
 = 1.2.1 / 2019-04-03 =
 * ✔︎ Compatibility WP 5.2
 * ✔︎ Compatibility WOO 3.6

woo-stripe-fee-in-report.php

@@ -5,8 +5,8 @@
  *
  * Description:             Shows Stripe fees in WooCommerce charts. Calculates a correct net total.
  *
- * Version:                 1.2.1
- * Revision:                2019-04-03
+ * Version:                 1.2.2
+ * Revision:                2019-10-23
  * Creation:                2018-02-24
  *
  * Author:                  studio RVOLA
@@ -16,10 +16,10 @@
  * Domain Path:             /languages
  *
  * Requires at least:       4.4
- * Tested up to:            5.2
+ * Tested up to:            5.3
  * Requires PHP:            7.0
  * WC requires at least:    3.1
- * WC tested up to:         3.6
+ * WC tested up to:         3.8
  *
  * License:                 GNU General Public License v3.0
  * License URI:             https://www.gnu.org/licenses/gpl-3.0.html