Merge remote-tracking branch 'origin/2.3'

# Conflicts:
#	README.txt
#	bootstrap.php
#	mailchimp-woocommerce.php

Author: ryanhungate

README.txt

@@ -3,11 +3,11 @@ Contributors: ryanhungate, Mailchimp
 Tags: ecommerce,email,workflows,mailchimp
 Donate link: https://mailchimp.com
 Requires at least: 4.9
-Tested up to: 5.2.3
-Stable tag: 2.2.4
+Tested up to: 5.2.5
+Stable tag: 2.3
 Requires PHP: 7.0
 WC requires at least: 3.5
-WC tested up to: 3.7
+WC tested up to: 3.7.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Connect your store to your Mailchimp audience to track sales, create targeted emails, send abandoned cart emails, and more.
@@ -63,14 +63,22 @@ The Mailchimp for WooCommerce supports Wordpress Multi Sites and below are a few
 - Deleting removes the connection between Mailchimp and WooCommerce, and uninstalls the plugin from your site.
 Refer to the Wordpress Codex for more information about [Multisite Network Administration](https://codex.wordpress.org/Multisite_Network_Administration)
 == Changelog ==
+= 2.3 =
+* adds action scheduler queue system 
+* documentation for Custom Merge Tags 
+* adds more specific installation requirements 
+* fixes PHP Error in class-mailchimp-order.php
+* fixes pop up blocks on connection
+* fixes unable to sync without accepting to auto subscribe existing customers
+* documentation for wp-cli class queue-command
 = 2.2 =
 * plugin reskin 
 * support for oauth to Mailchimp  
 * fixes sync issues with altered order IDs
 * fixes issues with trashed coupons 
 = 2.1.17 =
-* Re add resync button to sync tab, after sync finishes
-* Renamed 'merge_vars' to 'merge_fields' as per new Mailchimp naming convention
+* re add resync button to sync tab, after sync finishes
+* renamed 'merge_vars' to 'merge_fields' as per new Mailchimp naming convention
 * fixes issues with cloudflare
 * honors woo currency settings 
 * fix for failing custom coupon type

admin/class-mailchimp-woocommerce-admin.php

@@ -67,6 +67,12 @@ private function disconnect_store()
 		update_option('mailchimp-woocommerce-sync.completed_at', false);
 		update_option('mailchimp-woocommerce-resource-last-updated', false);
 
+		if (($store_id = mailchimp_get_store_id()) && ($mc = mailchimp_get_api()))  {
+            if ($mc->deleteStore($store_id)) {
+                mailchimp_log('store.disconnected', 'Store id ' . mailchimp_get_store_id() . ' has been disconnected');
+            }
+        }
+
 		return $options;
 	}
 
@@ -221,6 +227,47 @@ public function update_db_check() {
 				update_option( $this->plugin_name.'_woo_currency_update', true);
 			} 
 		}
+
+		if($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}mailchimp_jobs';") != $wpdb->prefix.'mailchimp_jobs') {
+			MailChimp_WooCommerce_Activator::create_queue_tables();
+			MailChimp_WooCommerce_Activator::migrate_jobs();
+		}
+
+		if (defined( 'DISABLE_WP_HTTP_WORKER' ) || defined( 'MAILCHIMP_USE_CURL' ) || defined( 'MAILCHIMP_REST_LOCALHOST' ) || defined( 'MAILCHIMP_REST_IP' ) || defined( 'MAILCHIMP_DISABLE_QUEUE') && true === MAILCHIMP_DISABLE_QUEUE) {
+			$constants_used = array();
+			
+			if (defined( 'DISABLE_WP_HTTP_WORKER')) {
+				$constants_used[] = 'DISABLE_WP_HTTP_WORKER';
+			}
+
+			if (defined( 'MAILCHIMP_DISABLE_QUEUE')) {
+				$constants_used[] = 'MAILCHIMP_DISABLE_QUEUE';
+			}
+
+			if (defined( 'MAILCHIMP_USE_CURL')) {
+				$constants_used[] = 'MAILCHIMP_USE_CURL';
+			}
+
+			if (defined( 'MAILCHIMP_REST_LOCALHOST')) {
+				$constants_used[] = 'MAILCHIMP_REST_LOCALHOST';
+			}
+
+			if (defined( 'MAILCHIMP_REST_IP')) {
+				$constants_used[] = 'MAILCHIMP_REST_IP';
+			}
+			
+			$text = __('Mailchimp for Woocommerce','mc-woocommerce').'<br/>'.
+			'<p id="http-worker-deprecated-message">'.__('We dectected that this site has the following constants defined, likely at wp-config.php file' ,'mc-woocommerce').': '.
+			implode(' | ', $constants_used).'<br/>'.
+			__('These constants are deprecated since Mailchimp for Woocommerce version 2.3. Please refer to the <a href="https://github.com/mailchimp/mc-woocommerce/wiki/">plugin official wiki</a> for further details.' ,'mc-woocommerce').'</p>';
+			
+			add_settings_error('mailchimp-woocommerce_notice', $this->plugin_name, $text, 'notice-info');
+			
+			if (!isset($_GET['page']) || $_GET['page'] != 'mailchimp-woocommerce') {
+				settings_errors();
+			}
+		}
+		
 	}
 
 	/**
@@ -400,14 +447,6 @@ protected function validatePostApiKey($input)
 			'mailchimp_account_info_username' => null,
 		);
 
-        if (($failure = mailchimp_woocommerce_check_if_http_worker_fails())) {
-            unset($data['mailchimp_api_key']);
-            $data['active_tab'] = 'api_key';
-            $data['api_ping_error'] = $failure;
-            mailchimp_error('admin@validateCanUseHttpWorker', $failure);
-            return $data;
-        }
-
 		$api = new MailChimp_WooCommerce_MailChimpApi($data['mailchimp_api_key']);
 
 		try {
@@ -721,6 +760,7 @@ protected function validatePostNewsletterSettings($input)
                 $this->setData('sync.config.resync', false);
                 $this->setData('sync.orders.current_page', 1);
                 $this->setData('sync.products.current_page', 1);
+				$this->setData('sync.coupons.current_page', 1);
                 $this->setData('sync.syncing', true);
                 $this->setData('sync.started_at', time());
 
@@ -1251,7 +1291,7 @@ public static function startSync()
         $coupon_sync->flagStartSync();
 
         // queue up the jobs
-        mailchimp_handle_or_queue($coupon_sync, 0, true);
+        mailchimp_handle_or_queue($coupon_sync, 0);
 	}
 
 	/**