From 27135138ff0c79c92c9e21330a3a1dc0d26cc287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Mon, 27 Apr 2020 11:25:59 +0300
Subject: [PATCH 1/7] Add clear selection button support

---
 templates/sizeme-product.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/templates/sizeme-product.php b/templates/sizeme-product.php
index 1f81a49..c90b339 100644
--- a/templates/sizeme-product.php
+++ b/templates/sizeme-product.php
@@ -103,6 +103,14 @@
 	$el = '.variations select';
 	if ( $sizeme->get_ui_option( WC_SizeMe_for_WooCommerce::INVOKE_ELEMENT, '' ) ) $el = $sizeme->get_ui_option( WC_SizeMe_for_WooCommerce::INVOKE_ELEMENT, '' );
 	echo 'if (window.jQuery) { jQuery(function() { if (document.querySelector("'.$el.'")) document.querySelector("'.$el.'").addEventListener("sizemeChange", function(e) { jQuery("'.$el.'").trigger("change"); }) } ); }';
+
+	//
+	// Also add support for possible clear size selection button
+	// Includes a timeout to let Woo do it's thing (clear the selection)
+	//
+	// @since 2.1.2
+	//
+	echo 'if (window.jQuery) jQuery(function() { jQuery(".reset_variations").click(function() { if (document.querySelector("'.$el.'")) { setTimeout(function() { document.querySelector("'.$el.'").dispatchEvent(new Event("change")); }, 200); } } ); } );';
 ?>
 	//]]>
 </script>

From c63e7fb4d2ba2ba43f1cbe9199d970224d0516af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Mon, 27 Apr 2020 11:34:58 +0300
Subject: [PATCH 2/7] Version hike to 2.1.2

---
 readme.txt                 | 6 ++++--
 sizeme-for-woocommerce.php | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index a9cd36e..449422e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 === SizeMe for WooCommerce ===
 Contributors: sizeme
-Tags: sizeme, measurements, size guide, size recommendations
+Tags: sizeme, measurements, sizeguide, size guide, size recommendations
 Requires at least: 3.8
 Tested up to: 5.4
-Stable tag: 2.1.1
+Stable tag: 2.1.2
 Requires PHP: 5.2.4
 WC requires at least: 2.5
 WC tested up to: 4.0.1
@@ -82,6 +82,8 @@ To install and take into use the SizeMe for WooCommerce plugin, follow the instr
 4. Visualize the fit using the SizeMe Sizing Bar™ and easy-to-understand illustrations
 
 == Changelog ==
+= 2.1.2 =
+* Added support for the clear size selection button.
 
 = 2.1.1 =
 * Fixed tracking of ajax-based add to cart events.  Also improved SKU handling with simple products.
diff --git a/sizeme-for-woocommerce.php b/sizeme-for-woocommerce.php
index f2b1d24..c7f158a 100644
--- a/sizeme-for-woocommerce.php
+++ b/sizeme-for-woocommerce.php
@@ -9,12 +9,15 @@
  * @wordpress-plugin
  * Plugin Name: SizeMe for WooCommerce
  * Description: SizeMe is a web store plugin that enables your consumers to input their measurements and get personalised fit recommendations based on actual product data.
- * Version:     2.1.1
+ * Version:     2.1.2
  * Author:      SizeMe Ltd
  * Author URI:  https://www.sizeme.com/
  * Text Domain: sizeme
  * License:     GPLv2 or later
  *
+ * WC requires at least: 2.5
+ * WC tested up to: 4.0.1
+ *
  * SizeMe for WooCommerce is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
@@ -50,7 +53,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string VERSION The plugin version.
 	 */
-	const VERSION = '2.1.1';
+	const VERSION = '2.1.2';
 
 	/**
 	 * Minimum WordPress version this plugin works with, used for dependency checks.

From 2aa765236d42e7cbe6000faef92c4180a06a10cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Tue, 28 Apr 2020 08:56:57 +0300
Subject: [PATCH 3/7] Add default value for service status

---
 classes/class-wc-settings-sizeme-for-woocommerce.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/class-wc-settings-sizeme-for-woocommerce.php b/classes/class-wc-settings-sizeme-for-woocommerce.php
index 52fda45..53750a1 100644
--- a/classes/class-wc-settings-sizeme-for-woocommerce.php
+++ b/classes/class-wc-settings-sizeme-for-woocommerce.php
@@ -141,6 +141,7 @@ public function get_settings() {
 					self::SERVICE_STATUS_ON   => 'On',
 					self::SERVICE_STATUS_OFF  => 'Off',
 				),
+				'default' => get_option( WC_SizeMe_for_WooCommerce::SERVICE_STATUS_ID, self::SERVICE_STATUS_OFF ),
 				'id'      => WC_SizeMe_for_WooCommerce::SERVICE_STATUS_ID,
 			),
 			array(

From 772d3ca2fad5fd3eaca43a5028e4e865f7adf3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Tue, 28 Apr 2020 08:57:17 +0300
Subject: [PATCH 4/7] Version hike to 2.2.0

---
 readme.txt                 | 3 +++
 sizeme-for-woocommerce.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 449422e..0095cb6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -82,6 +82,9 @@ To install and take into use the SizeMe for WooCommerce plugin, follow the instr
 4. Visualize the fit using the SizeMe Sizing Bar™ and easy-to-understand illustrations
 
 == Changelog ==
+= 2.2.0 =
+* Options (finally) prefixed to avoid plugin conflicts and some significant code cleanup too.
+
 = 2.1.2 =
 * Added support for the clear size selection button.
 
diff --git a/sizeme-for-woocommerce.php b/sizeme-for-woocommerce.php
index c7f158a..8ba44b2 100644
--- a/sizeme-for-woocommerce.php
+++ b/sizeme-for-woocommerce.php
@@ -9,7 +9,7 @@
  * @wordpress-plugin
  * Plugin Name: SizeMe for WooCommerce
  * Description: SizeMe is a web store plugin that enables your consumers to input their measurements and get personalised fit recommendations based on actual product data.
- * Version:     2.1.2
+ * Version:     2.2.0
  * Author:      SizeMe Ltd
  * Author URI:  https://www.sizeme.com/
  * Text Domain: sizeme
@@ -53,7 +53,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string VERSION The plugin version.
 	 */
-	const VERSION = '2.1.2';
+	const VERSION = '2.2.0';
 
 	/**
 	 * Minimum WordPress version this plugin works with, used for dependency checks.

From f483e5a67047aaa19bd3d3debc38becb1495517b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Tue, 28 Apr 2020 08:57:34 +0300
Subject: [PATCH 5/7] Change plugin version info

---
 templates/sizeme-product.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/sizeme-product.php b/templates/sizeme-product.php
index c90b339..5ab202f 100644
--- a/templates/sizeme-product.php
+++ b/templates/sizeme-product.php
@@ -34,8 +34,8 @@
 <script type="text/javascript">
 	//<![CDATA[
 	var sizeme_options = {
-		service_status: "<?php echo esc_js( $sizeme->get_service_status() ); ?>",
-		pluginVersion: "WC-<?php echo WC_VERSION; ?>",
+		serviceStatus: "<?php echo esc_js( $sizeme->get_service_status() ); ?>",
+		pluginVersion: "WC-<?php echo WC_SizeMe_for_WooCommerce::VERSION; ?>",
 		shopType: "woocommerce",
 		clientKey: "<?php echo esc_js( $sizeme->get_client_key() ); ?>",
 		uiOptions: {}

From c5154442b244179696aa3dc570ec54829bf5388f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Tue, 28 Apr 2020 08:58:51 +0300
Subject: [PATCH 6/7] Change all options to prefixed ones

* added a converter when updating the version
---
 sizeme-for-woocommerce.php | 90 +++++++++++++++++++++++++++++++-------
 1 file changed, 73 insertions(+), 17 deletions(-)

diff --git a/sizeme-for-woocommerce.php b/sizeme-for-woocommerce.php
index 8ba44b2..02d4665 100644
--- a/sizeme-for-woocommerce.php
+++ b/sizeme-for-woocommerce.php
@@ -119,6 +119,15 @@ class WC_SizeMe_for_WooCommerce {
 	 */
 	protected static $attributes = array();
 
+	/**
+	 * Plugin version option key.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @var string SERVICE_STATUS_ID The key for the service status.
+	 */
+	const PLUGIN_VERSION_KEY = 'sizeme_version';
+
 	/**
 	 * Service status option key, used when saving settings and retrieving them.
 	 *
@@ -126,7 +135,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string SERVICE_STATUS_ID The key for the service status.
 	 */
-	const SERVICE_STATUS_ID = 'service_status';
+	const SERVICE_STATUS_ID = 'sizeme_service_status';
 
 	/**
 	 * UI option, API key, used in conversations with the SizeMe Shop API
@@ -135,7 +144,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string API_KEY The key for the Key!
 	 */
-	const API_KEY = 'api_key';
+	const API_KEY = 'sizeme_api_key';
 
 	/**
 	 * UI option, append content to element, used in settings.
@@ -144,7 +153,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string APPEND_CONTENT_TO The key for UI option.
 	 */
-	const APPEND_CONTENT_TO = 'append_content_to';
+	const APPEND_CONTENT_TO = 'sizeme_append_content_to';
 
 	/**
 	 * UI option, invoke element, used in settings.
@@ -153,7 +162,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string INVOKE_ELEMENT The key for UI option.
 	 */
-	const INVOKE_ELEMENT = 'invoke_element';
+	const INVOKE_ELEMENT = 'sizeme_invoke_element';
 
 	/**
 	 * UI option, size selector type, used in settings.
@@ -162,7 +171,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string SIZE_SELECTION_TYPE The key for UI option.
 	 */
-	const SIZE_SELECTION_TYPE = 'size_selection_type';
+	const SIZE_SELECTION_TYPE = 'sizeme_size_selection_type';
 
 	/**
 	 * UI option, add to cart element, used in settings.
@@ -171,7 +180,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string ADD_TO_CART_ELEMENT The key for UI option.
 	 */
-	const ADD_TO_CART_ELEMENT = 'add_to_cart_element';
+	const ADD_TO_CART_ELEMENT = 'sizeme_add_to_cart_element';
 
 	/**
 	 * UI option, add to cart event, used in settings.
@@ -180,7 +189,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string ADD_TO_CART_EVENT The key for UI option.
 	 */
-	const ADD_TO_CART_EVENT = 'add_to_cart_event';
+	const ADD_TO_CART_EVENT = 'sizeme_add_to_cart_event';
 
 	/**
 	 * UI option, add toggler
@@ -189,7 +198,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var boolean ADD_TOGGLER The key for UI option.
 	 */
-	const ADD_TOGGLER = 'add_toggler';
+	const ADD_TOGGLER = 'sizeme_add_toggler';
 
 	/**
 	 * UI option, lang override, used in settings.
@@ -198,7 +207,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string LANG_OVERRIDE The key for UI option.
 	 */
-	const LANG_OVERRIDE = 'lang_override';
+	const LANG_OVERRIDE = 'sizeme_lang_override';
 
 	/**
 	 * UI option, custom css, used in settings.
@@ -207,7 +216,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string CUSTOM_CSS The key for UI option.
 	 */
-	const CUSTOM_CSS = 'custom_css';
+	const CUSTOM_CSS = 'sizeme_custom_css';
 
 	/**
 	 * UI option, additional translations, used in settings.
@@ -216,7 +225,16 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string ADDITIONAL_TRANSLATIONS The key for UI option.
 	 */
-	const ADDITIONAL_TRANSLATIONS = 'additional_translations';
+	const ADDITIONAL_TRANSLATIONS = 'sizeme_additional_translations';
+
+	/**
+	 * UI option, max recommendation distance, used in settings.
+	 *
+	 * @since 2.1.0
+	 *
+	 * @var string MAX_RECOMMENDATION_DISTANCE The key for UI option.
+	 */
+	const MAX_RECOMMENDATION_DISTANCE = 'sizeme_max_recommendation_distance';
 
 	/**
 	 * UI option, max recommendation distance, used in settings.
@@ -225,7 +243,7 @@ class WC_SizeMe_for_WooCommerce {
 	 *
 	 * @var string MAX_RECOMMENDATION_DISTANCE The key for UI option.
 	 */
-	const MAX_RECOMMENDATION_DISTANCE = 'max_recommendation_distance';
+	const SIZE_ATTRIBUTES_KEY = 'sizeme_size_attributes';
 
     /**
      * Info related to SizeMe API requests
@@ -333,7 +351,6 @@ public function get_service_status() {
 		return get_option( self::SERVICE_STATUS_ID );
 	}
 
-
 	/**
 	 * Get the the client key which is a hash of the super-secret api key
 	 *
@@ -518,7 +535,7 @@ protected function load_skus( WC_Product_Variable $product ) {
 	 * @return array|string If parameter $one is true, returns a string of attribute name, otherwise an array of names.
 	 */
 	protected function get_size_attribute( WC_Product_Variable $product, $one = true ) {
-		$size_attributes    = get_option( 'size_attributes', array() );
+		$size_attributes    = get_option( self::SIZE_ATTRIBUTES_KEY, array() );
 		$product_attributes = $product->get_attributes();
 		$attribute_names    = array();
 		foreach ( $product_attributes as $attribute_name => $attribute_data ) {
@@ -762,7 +779,6 @@ public function get_plugin_name() {
 	 */
 	public function add_setting_page( $settings ) {
 		$settings[] = require_once( 'classes/class-wc-settings-sizeme-for-woocommerce.php' );
-
 		return $settings;
 	}
 
@@ -823,10 +839,12 @@ protected function init_frontend() {
 	 */
 	protected function init_admin() {
 		add_filter( 'woocommerce_get_settings_pages', array( $this, 'add_setting_page' ) );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
 		// ajax based add to carts come this way
 		if ( wp_doing_ajax() ) {
 			add_action( 'woocommerce_add_to_cart', array( $this, 'send_add_to_cart_info' ), 10, 6 );
+		} else {
+			// Migrate dumb old option system to new if applicable
+			$this->migrate_possible_options();
 		}
 	}
 
@@ -838,7 +856,7 @@ protected function init_admin() {
 	 * @since 1.0.0
 	 */
 	public function admin_notices() {
-		$size_attributes = get_option( 'size_attributes', array() );
+		$size_attributes = get_option( self::SIZE_ATTRIBUTES_KEY, array() );
 		if ( empty( $size_attributes ) ) {
 			$this->render( 'admin-notice' );
 		}
@@ -914,6 +932,44 @@ protected function check_dependencies() {
 		return true;
 	}
 
+	/**
+	 * Migrate old options.
+	 *
+	 * Versions before 2.2.0 used non-prefixed names for options and that is very bad.
+	 *
+	 * @since 2.2.0
+	 *
+	 * @return bool True always
+	 */
+	protected function migrate_possible_options() {
+		// Check if the sizeme_version option has been set.  If it's not present, previous (non-prefixed) option keys are likely to been set.
+		if ( get_option('sizeme_version', NULL) === NULL ) {
+			// Check if there actually are old options present
+			if ( get_option('service_status', NULL) !== NULL ) {
+				require_once( WP_PLUGIN_DIR . '/woocommerce/includes/admin/settings/class-wc-settings-page.php' );
+				require_once( 'classes/class-wc-settings-sizeme-for-woocommerce.php' );
+				$setting_page = New WC_Settings_SizeMe_for_WooCommerce;
+				$settings = $setting_page->get_settings();
+				foreach( $settings as $s ) {
+					// check if old style option exists and update if so
+					if ( isset( $s['id'] ) ) {
+						$current_id = $s['id'];
+						if ( strpos( $current_id, 'sizeme_' ) !== false ) {
+							$old_id = str_replace( 'sizeme_','',$current_id );
+							if ( get_option($old_id, NULL) !== NULL ) {
+								update_option( $current_id, get_option( $old_id ) );
+								delete_option( $old_id );
+							}
+						}
+					}
+				}
+			}
+			add_option( 'sizeme_version', self::VERSION );
+		}
+
+		return true;
+	}
+
 	/**
 	 * Override the locate_template function.
 	 *

From b24702de5760d8fc88101160ac9db0e80e20e302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20K=C3=B6n=C3=B6nen?= <ville@nomasi.com>
Date: Tue, 28 Apr 2020 08:59:22 +0300
Subject: [PATCH 7/7] Size attributes option changed and toggler default too

---
 classes/class-wc-settings-sizeme-for-woocommerce.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-wc-settings-sizeme-for-woocommerce.php b/classes/class-wc-settings-sizeme-for-woocommerce.php
index 53750a1..f8aef6d 100644
--- a/classes/class-wc-settings-sizeme-for-woocommerce.php
+++ b/classes/class-wc-settings-sizeme-for-woocommerce.php
@@ -81,7 +81,6 @@ class WC_Settings_SizeMe_for_WooCommerce extends WC_Settings_Page {
 	 */
 	const ADD_TOGGLER_YES = 'yes';
 
-
 	/**
 	 * Class constructor.
 	 *
@@ -165,7 +164,7 @@ public function get_settings() {
 				'type'    => 'multiselect',
 				'options' => self::load_size_attribute_options(),
 				'css'     => 'width: 150px; height: 150px;',
-				'id'      => 'size_attributes',
+				'id'      => WC_SizeMe_for_WooCommerce::SIZE_ATTRIBUTES_KEY,
 			),
 			array(
 				'type' => 'sectionend',
@@ -213,6 +212,7 @@ public function get_settings() {
 					self::ADD_TOGGLER_NO => 'No',
 					self::ADD_TOGGLER_YES   => 'Yes',
 				),
+				'default' => get_option( WC_SizeMe_for_WooCommerce::ADD_TOGGLER, self::ADD_TOGGLER_NO ),
 				'id'      => WC_SizeMe_for_WooCommerce::ADD_TOGGLER,
 			),
 			array(