Merge pull request #1150 from mailchimp/4.0.2

4.0.2

Author: ryanhungate

CHANGELOG.txt

@@ -1,4 +1,8 @@
 == Changelog ==
+= 4.0.2 =
+* adds the Changelog back to the UI
+* tested up to Woocommerce v8.9
+* fixed connection issue when disconnecting and reconnecting
 = 4.0.1 =
 * Log changes
 * Add audience name to overview

README.txt

@@ -4,10 +4,10 @@ Tags: ecommerce,email,workflows,mailchimp
 Donate link: https://mailchimp.com
 Requires at least: 4.9
 Tested up to: 6.5
-Stable tag: 4.0.1
+Stable tag: 4.0.2
 Requires PHP: 7.4
 WC requires at least: 4.2
-WC tested up to: 8.8
+WC tested up to: 8.9
 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.
@@ -77,8 +77,8 @@ At this time, the synchronization of product categories from WooCommerce to Mail
 = My question is not listed =
 If you are unable to sync or connect with Mailchimp, you can open a ticket on our [Github plugin page](https://github.com/mailchimp/mc-woocommerce/issues). Please provide the version of the plugin and PHP you're using, any fatal errors in the WooCommerce logs (WooCommerce -> Status -> Logs) you're seeing, along with relevant information to the problem you're experiencing.
 
-
-= 4.0.1 =
-* Log changes
-* Add audience name to overview
-
+== Changelog ==
+= 4.0.2 =
+* adds the Changelog back to the UI
+* tested up to Woocommerce v8.9
+* fixed connection issue when disconnecting and reconnecting

admin/class-mailchimp-woocommerce-admin.php

@@ -12,8 +12,8 @@
 		<span><?php esc_html_e( 'Connect your store to Mailchimp', 'mailchimp-for-woocommerce' ); ?></span>
 	</legend>
 	<div class="mc-wc-actions">
-		<a class="mc-wc-btn mc-wc-btn-primary-outline create-account" href='#mc-woocommerce-create-account'><?php esc_html_e( 'Create account', 'mailchimp-for-woocommerce' ); ?></a>
-		<a id="mailchimp-oauth-connect" class="mc-wc-btn mc-wc-btn-primary oauth-connect"><?php esc_html_e( 'Connect', 'mailchimp-for-woocommerce' );  ?></a>
+        <a id="mailchimp-oauth-connect" class="mc-wc-btn mc-wc-btn-primary oauth-connect"><?php esc_html_e( 'Connect Account', 'mailchimp-for-woocommerce' );  ?></a>
+		<a class="mc-wc-btn mc-wc-btn-primary-outline create-account" href='#mc-woocommerce-create-account'><?php esc_html_e( 'Create Account', 'mailchimp-for-woocommerce' ); ?></a>
 	</div>
 
 	<input type="hidden" id="<?php echo esc_attr( $this->plugin_name ); ?>-mailchimp-api-key" name="<?php echo esc_attr( $this->plugin_name ); ?>[mailchimp_api_key]" value="<?php echo isset( $options['mailchimp_api_key'] ) ? esc_html( $options['mailchimp_api_key'] ) : ''; ?>" required/>

admin/v2/templates/connect-accounts/button-actions.php

@@ -96,7 +96,7 @@ function mailchimp_environment_variables() {
     return (object) array(
         'repo' => 'master',
         'environment' => 'production', // staging or production
-        'version' => '4.0.1',
+        'version' => '4.0.2',
         'php_version' => phpversion(),
         'wp_version' => (empty($wp_version) ? 'Unknown' : $wp_version),
         'wc_version' => function_exists('WC') ? WC()->version : null,

bootstrap.php

@@ -230,7 +230,7 @@ private function define_admin_hooks() {
 		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Add menu item
-		$this->loader->add_action('admin_menu', $plugin_admin, 'add_plugin_admin_menu_2', 71);
+		$this->loader->add_action('admin_menu', $plugin_admin, 'add_plugin_admin_menu', 71);
 
         // Add WooCommerce Navigation Bar
         // $this->loader->add_action('admin_menu', $plugin_admin, 'add_woocommerce_navigation_bar');

includes/class-mailchimp-woocommerce.php

@@ -16,7 +16,7 @@
  * Plugin Name:       Mailchimp for WooCommerce
  * Plugin URI:        https://mailchimp.com/connect-your-store/
  * Description:       Connects WooCommerce to Mailchimp to sync your store data, send targeted campaigns to your customers, and sell more stuff. 
- * Version:           4.0.1
+ * Version:           4.0.2
  * Author:            Mailchimp
  * Author URI:        https://mailchimp.com
  * License:           GPL-2.0+
@@ -26,7 +26,7 @@
  * Requires at least: 4.9
  * Tested up to: 6.5
  * WC requires at least: 4.2
- * WC tested up to: 8.8
+ * WC tested up to: 8.9
  */
 
 // If this file is called directly, abort.