From 2230fedbe4ee8dfc73f6a9b65c35a987cd4629e3 Mon Sep 17 00:00:00 2001 From: Ryan Hungate Date: Fri, 10 May 2024 11:23:54 -0400 Subject: [PATCH 1/7] version bump --- CHANGELOG.txt | 3 +++ README.txt | 10 +++++----- bootstrap.php | 2 +- mailchimp-woocommerce.php | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8f55fe5c..1942e728 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,7 @@ == Changelog == += 4.0.2 = +* Changelog in UI +* UI updates = 4.0.1 = * Log changes * Add audience name to overview diff --git a/README.txt b/README.txt index 55905e0a..65ce77ed 100644 --- a/README.txt +++ b/README.txt @@ -4,7 +4,7 @@ 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 @@ -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 = +* Changelog in UI +* UI updates diff --git a/bootstrap.php b/bootstrap.php index a69a7347..6fd6007e 100644 --- a/bootstrap.php +++ b/bootstrap.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, diff --git a/mailchimp-woocommerce.php b/mailchimp-woocommerce.php index 94842d7b..e223283d 100644 --- a/mailchimp-woocommerce.php +++ b/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+ From 3170c82bf3d7c49f34bd907b9d26f49932c76116 Mon Sep 17 00:00:00 2001 From: Ryan Hungate Date: Fri, 10 May 2024 11:24:51 -0400 Subject: [PATCH 2/7] reverse button order --- admin/v2/templates/connect-accounts/button-actions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/v2/templates/connect-accounts/button-actions.php b/admin/v2/templates/connect-accounts/button-actions.php index 189e364f..6f811038 100644 --- a/admin/v2/templates/connect-accounts/button-actions.php +++ b/admin/v2/templates/connect-accounts/button-actions.php @@ -12,8 +12,8 @@
+ -
From 000aa21dafcd5c49f27d610711bb408fe48b652f Mon Sep 17 00:00:00 2001 From: Ryan Hungate Date: Fri, 10 May 2024 11:28:26 -0400 Subject: [PATCH 3/7] update button text --- admin/v2/templates/connect-accounts/button-actions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/v2/templates/connect-accounts/button-actions.php b/admin/v2/templates/connect-accounts/button-actions.php index 6f811038..0226dbac 100644 --- a/admin/v2/templates/connect-accounts/button-actions.php +++ b/admin/v2/templates/connect-accounts/button-actions.php @@ -12,8 +12,8 @@
- - + +
From 1056a1e56a221f919125c615aa79ae3f3672cec8 Mon Sep 17 00:00:00 2001 From: Ryan Hungate Date: Fri, 10 May 2024 12:08:01 -0400 Subject: [PATCH 4/7] put menu item back on the side --- admin/class-mailchimp-woocommerce-admin.php | 5 +++-- includes/class-mailchimp-woocommerce.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/class-mailchimp-woocommerce-admin.php b/admin/class-mailchimp-woocommerce-admin.php index b780c70d..81276a1b 100644 --- a/admin/class-mailchimp-woocommerce-admin.php +++ b/admin/class-mailchimp-woocommerce-admin.php @@ -180,7 +180,8 @@ public function enqueue_scripts( $hook ) { public function add_plugin_admin_menu() { // Add woocommerce menu subitem - $mailchimp_icon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDgwMCA4MDAiIHZpZXdCb3g9IjAgMCA4MDAgODAwIj48cGF0aCBkPSJNNTUyLjQgMzk3LjJjLTQuMy0uMS03LjggNC42LTcuOSAxMC41LS4xIDUuOSAzLjMgMTAuNyA3LjYgMTAuNyA0LjMuMSA3LjgtNC42IDcuOS0xMC41LjEtNS44LTMuMy0xMC42LTcuNi0xMC43ek01NDIuNiAzODMuNWM0LjQtLjUgOC42LS42IDEyLjQgMCAyLjItNS4xIDIuNi0xNCAuNi0yMy42LTMtMTQuMy03LTIyLjktMTUuNC0yMS41LTguNCAxLjMtOC43IDExLjctNS43IDI2IDEuOCA4IDQuOCAxNC44IDguMSAxOS4xek00NzEgMzk0LjhjNiAyLjYgOS43IDQuMyAxMSAyLjkgMS0uOS43LTIuOC0uNy01LjEtMy45LTUuNS05LjItOS44LTE1LjUtMTIuNC0xMy42LTUuNi0yOS4xLTMuOC00MC45IDQuOS00IDIuOS03LjcgNy03LjMgOS40LjIuOC44IDEuNCAyLjIgMS43IDMuMy40IDE0LjgtNS41IDI4LjEtNi4zIDkuNC0uNyAxNy4xIDIuMyAyMy4xIDQuOXpNNDU5IDQwMS43Yy03LjcgMS4yLTEyIDMuOC0xNC44IDYuMi0yLjQgMi4xLTMuOCA0LjMtMy44IDUuOWwuNiAxLjQgMS4yLjVjMS44IDAgNS43LTEuNSA1LjctMS41IDEwLjgtMy44IDE4LTMuNCAyNS4xLTIuNiAzLjkuNSA1LjcuNyA2LjYtLjcuMi0uNC42LTEuMi0uMi0yLjUtMS45LTMtOS43LTgtMjAuNC02Ljd6TTUxOC40IDQyNi45YzUuMyAyLjYgMTEuMSAxLjUgMTMtMi4zIDItMy44LS44LTkuMS02LjEtMTEuNi01LjMtMi42LTExLjEtMS42LTEzIDIuMi0xLjkgMy44LjkgOS4xIDYuMSAxMS43ek0yNjQuMiA1MDMuM2MtMS4xLTEuMy0yLjgtMS00LjUtLjUtMS4yLjItMi41LjYtNCAuNS0yLjkuMS01LjctMS4zLTcuNC0zLjctMi0zLTEuOS03LjUuMy0xMi42bDEtMi4zYzMuNS03LjcgOS4yLTIwLjYgMi43LTMyLjktNC4zLTguOC0xMi43LTE0LjktMjIuNC0xNi4zLTkuMi0xLjItMTguMyAyLjEtMjQuNiA4LjktOS41IDEwLjQtMTAuOSAyNC43LTkuMSAyOS44LjcgMS45IDEuOCAyLjQgMi41IDIuNSAxLjYuMiA0LTEgNS41LTVsLjUtMS4zYy43LTIuMSAxLjktNi4xIDMuOS05LjMgNS4yLTggMTUuOS0xMC4yIDIzLjktNSA2LjcgNC40IDkuMiAxMi41IDYuMyAyMC4zLTEuNSA0LTMuOCAxMS43LTMuMyAxOCAxLjEgMTIuOCA5IDE3LjkgMTYgMTguNSA2LjkuMiAxMS43LTMuNiAxMi45LTYuNC44LTEuOC4yLTIuOC0uMi0zLjJ6Ii8+PHBhdGggZD0iTTY2MC43IDQ3OS45Yy0uMy0xLTItNy4yLTQuMy0xNC43bC00LjgtMTIuOGM5LjQtMTQuMSA5LjUtMjYuNiA4LjMtMzMuOC0xLjQtOS4yLTUuOC0xNy42LTEyLjQtMjQuMS03LjQtNy43LTIyLjYtMTUuNy00My44LTIxLjdsLTExLjItMy4xYy0uMS0uNS0uNi0yNi4zLTEtMzcuNC0uNC04LTEtMjAuNS00LjktMzIuOS00LjctMTYuNy0xMi43LTMxLjMtMjIuOC00MC43IDI3LjgtMjguOCA0NS4yLTYwLjYgNDUuMS04Ny44LS4xLTUyLjQtNjQuNC02OC4zLTE0My43LTM1LjRsLTE2LjggNy4xYy0uMS0uMS0zMC40LTI5LjgtMzAuOC0zMC4yLTkwLjUtNzguOC0zNzMuMSAyMzUuNC0yODIuNyAzMTEuN2wxOS44IDE2LjdjLTUuMyAxNC4zLTcuMiAyOS43LTUuNSA0NC44IDIuMiAyMSAxMyA0MS4xIDMwLjUgNTYuNyAxNi43IDE0LjcgMzguNiAyNC4xIDU5LjkgMjQuMSAzNSA4MS4xIDExNS40IDEzMC44IDIwOS42IDEzMy42IDEwMS4xIDMgMTg1LjktNDQuNCAyMjEuNS0xMjkuNiAyLjMtNiAxMi4yLTMyLjkgMTIuMi01Ni43LS4xLTIzLjktMTMuNi0zMy44LTIyLjItMzMuOHptLTQxMy41IDYzLjdjLTMuMS42LTYuMi44LTkuMy43LTMwLjUtLjktNjMuNS0yOC4zLTY2LjgtNjAuOS0zLjYtMzYgMTQuOC02My43IDQ3LjQtNzAuMyAzLjktLjggOC42LTEuMyAxMy43LTEgMTguMyAxLjEgNDUuMSAxNS4xIDUxLjMgNTQuOCA1LjQgMzUuMi0zLjMgNzEuMS0zNi4zIDc2Ljd6bS0zNC0xNTJjLTE5LjggMy43LTM3LjQgMTQuOS00OS4xIDMxLjMtNi42LTUuNS0xOC43LTE2LTIwLjktMjAuMS0xNy41LTMzLjEgMTktOTcuNiA0NC42LTEzNCA2My04OS45IDE2MS43LTE1OCAyMDcuNC0xNDUuNyA3LjQgMi4xIDMyIDMwLjcgMzIgMzAuN3MtNDUuNyAyNS4zLTg4LjEgNjAuNmMtNTcgNDQtMTAwLjIgMTA3LjktMTI1LjkgMTc3LjJ6bTExNi4zLTEyMy4yYzIyLjQtMjUuOSA1MC00OC40IDc0LjctNjEgLjgtLjUgMS43LjUgMS4zIDEuMy0zIDUuMy01LjQgMTEtNi45IDE2LjktLjIuOS44IDEuNiAxLjUgMS4xIDE1LjQtMTAuNSA0Mi4xLTIxLjcgNjUuNi0yMy4xLjUtLjEgMS4xLjMgMS4yLjguMS40LS4xLjgtLjUgMS0zLjkgMy03LjQgNi41LTEwLjMgMTAuNGExIDEgMCAwIDAgLjggMS42YzE2LjUuMSAzOS43IDUuOCA1NC44IDE0LjMgMSAuNi4zIDIuNi0uOCAyLjMtMjIuOS01LjItNjAuNC05LjItOTkuMy4zLTM0LjggOC41LTYxLjMgMjEuNS04MC42IDM1LjYtMS4xLjctMi4zLS42LTEuNS0xLjV6bTMzMi4yIDI1My4zYy00LjQgMjYuNi0xNS43IDQ4LjItMzQuNyA2OC0xMS44IDEyLjktMjYgMjMuNC00MS42IDMxLjEtOC43IDQuNi0xNy44IDguNC0yNy4xIDExLjUtNzEuNiAyMy40LTE0NS0yLjMtMTY4LjYtNTcuNi0xLjktNC4yLTMuNS04LjYtNC43LTEzLjEtMTAuMS0zNi40LTEuNS04MCAyNS4yLTEwNy41IDEuNy0xLjcgMy40LTMuOCAzLjQtNi40IDAtMi4xLTEuNC00LjQtMi42LTYuMS05LjMtMTMuNS00MS44LTM2LjYtMzUuMi04MS4zIDQuNi0zMi4xIDMyLjctNTQuNyA1OC45LTUzLjRsNi43LjRjMTEuMy43IDIxLjIgMi4xIDMwLjYgMi41IDE1LjcuNiAyOS43LTEuNiA0Ni40LTE1LjUgNS42LTQuNyAxMC4xLTguOCAxNy43LTEwIC44LS4yIDIuOC0uOCA2LjgtLjcgNC4xLjIgOCAxLjQgMTEuNCAzLjYgMTMuMyA4LjkgMTUuMiAzMC40IDE2IDQ2LjIuNCA5IDEuNSAzMC43IDEuOCAzNi45LjkgMTQuMyA0LjYgMTYuMyAxMi4yIDE4LjggNC4zIDEuNSA4LjMgMi41IDE0LjEgNC4yIDE3LjYgNC45IDI4LjIgMTAgMzQuOCAxNi40IDMuNCAzLjMgNS42IDcuNyA2LjMgMTIuNCAyLjIgMTUuMi0xMS44IDM0LTQ4LjUgNTEuMS00MC4yIDE4LjYtODkgMjMuNC0xMjIuNiAxOS42bC0xMS44LTEuM2MtMjctMy42LTQyLjMgMzEuMi0yNi4xIDU1IDEwLjQgMTUuNCAzOC44IDI1LjQgNjcuMiAyNS40IDY1LjEuMSAxMTUuMi0yNy43IDEzMy44LTUxLjhsMS41LTIuMWMuOS0xLjQuMi0yLjEtMS0xLjQtMTUuMiAxMC40LTgyLjggNTEuNy0xNTUgMzkuMyAwIDAtOC44LTEuNS0xNi44LTQuNi02LjMtMi40LTE5LjctOC42LTIxLjMtMjIuMyA1OC4yIDE4LjEgOTUgMSA5NSAxIC43LS4zIDEuMS0xIDEtMS44LS4xLS45LS45LTEuNi0xLjgtMS41aC0uMXMtNDcuOCA3LjEtOTMtOS40YzQuOS0xNiAxOC0xMC4zIDM3LjgtOC42IDMwLjcgMS44IDYxLjUtMS41IDkxLjItOS45IDIwLjQtNS45IDQ3LjMtMTcuNSA2OC4yLTMzLjkgNy4xIDE1LjUgOS41IDMyLjUgOS41IDMyLjVzNS40LTEgMTAgMS44YzQgMi44IDcuMSA4LjMgNSAyMi41eiIvPjwvc3ZnPg=='; + //$mailchimp_icon = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDgwMCA4MDAiIHZpZXdCb3g9IjAgMCA4MDAgODAwIj48cGF0aCBkPSJNNTUyLjQgMzk3LjJjLTQuMy0uMS03LjggNC42LTcuOSAxMC41LS4xIDUuOSAzLjMgMTAuNyA3LjYgMTAuNyA0LjMuMSA3LjgtNC42IDcuOS0xMC41LjEtNS44LTMuMy0xMC42LTcuNi0xMC43ek01NDIuNiAzODMuNWM0LjQtLjUgOC42LS42IDEyLjQgMCAyLjItNS4xIDIuNi0xNCAuNi0yMy42LTMtMTQuMy03LTIyLjktMTUuNC0yMS41LTguNCAxLjMtOC43IDExLjctNS43IDI2IDEuOCA4IDQuOCAxNC44IDguMSAxOS4xek00NzEgMzk0LjhjNiAyLjYgOS43IDQuMyAxMSAyLjkgMS0uOS43LTIuOC0uNy01LjEtMy45LTUuNS05LjItOS44LTE1LjUtMTIuNC0xMy42LTUuNi0yOS4xLTMuOC00MC45IDQuOS00IDIuOS03LjcgNy03LjMgOS40LjIuOC44IDEuNCAyLjIgMS43IDMuMy40IDE0LjgtNS41IDI4LjEtNi4zIDkuNC0uNyAxNy4xIDIuMyAyMy4xIDQuOXpNNDU5IDQwMS43Yy03LjcgMS4yLTEyIDMuOC0xNC44IDYuMi0yLjQgMi4xLTMuOCA0LjMtMy44IDUuOWwuNiAxLjQgMS4yLjVjMS44IDAgNS43LTEuNSA1LjctMS41IDEwLjgtMy44IDE4LTMuNCAyNS4xLTIuNiAzLjkuNSA1LjcuNyA2LjYtLjcuMi0uNC42LTEuMi0uMi0yLjUtMS45LTMtOS43LTgtMjAuNC02Ljd6TTUxOC40IDQyNi45YzUuMyAyLjYgMTEuMSAxLjUgMTMtMi4zIDItMy44LS44LTkuMS02LjEtMTEuNi01LjMtMi42LTExLjEtMS42LTEzIDIuMi0xLjkgMy44LjkgOS4xIDYuMSAxMS43ek0yNjQuMiA1MDMuM2MtMS4xLTEuMy0yLjgtMS00LjUtLjUtMS4yLjItMi41LjYtNCAuNS0yLjkuMS01LjctMS4zLTcuNC0zLjctMi0zLTEuOS03LjUuMy0xMi42bDEtMi4zYzMuNS03LjcgOS4yLTIwLjYgMi43LTMyLjktNC4zLTguOC0xMi43LTE0LjktMjIuNC0xNi4zLTkuMi0xLjItMTguMyAyLjEtMjQuNiA4LjktOS41IDEwLjQtMTAuOSAyNC43LTkuMSAyOS44LjcgMS45IDEuOCAyLjQgMi41IDIuNSAxLjYuMiA0LTEgNS41LTVsLjUtMS4zYy43LTIuMSAxLjktNi4xIDMuOS05LjMgNS4yLTggMTUuOS0xMC4yIDIzLjktNSA2LjcgNC40IDkuMiAxMi41IDYuMyAyMC4zLTEuNSA0LTMuOCAxMS43LTMuMyAxOCAxLjEgMTIuOCA5IDE3LjkgMTYgMTguNSA2LjkuMiAxMS43LTMuNiAxMi45LTYuNC44LTEuOC4yLTIuOC0uMi0zLjJ6Ii8+PHBhdGggZD0iTTY2MC43IDQ3OS45Yy0uMy0xLTItNy4yLTQuMy0xNC43bC00LjgtMTIuOGM5LjQtMTQuMSA5LjUtMjYuNiA4LjMtMzMuOC0xLjQtOS4yLTUuOC0xNy42LTEyLjQtMjQuMS03LjQtNy43LTIyLjYtMTUuNy00My44LTIxLjdsLTExLjItMy4xYy0uMS0uNS0uNi0yNi4zLTEtMzcuNC0uNC04LTEtMjAuNS00LjktMzIuOS00LjctMTYuNy0xMi43LTMxLjMtMjIuOC00MC43IDI3LjgtMjguOCA0NS4yLTYwLjYgNDUuMS04Ny44LS4xLTUyLjQtNjQuNC02OC4zLTE0My43LTM1LjRsLTE2LjggNy4xYy0uMS0uMS0zMC40LTI5LjgtMzAuOC0zMC4yLTkwLjUtNzguOC0zNzMuMSAyMzUuNC0yODIuNyAzMTEuN2wxOS44IDE2LjdjLTUuMyAxNC4zLTcuMiAyOS43LTUuNSA0NC44IDIuMiAyMSAxMyA0MS4xIDMwLjUgNTYuNyAxNi43IDE0LjcgMzguNiAyNC4xIDU5LjkgMjQuMSAzNSA4MS4xIDExNS40IDEzMC44IDIwOS42IDEzMy42IDEwMS4xIDMgMTg1LjktNDQuNCAyMjEuNS0xMjkuNiAyLjMtNiAxMi4yLTMyLjkgMTIuMi01Ni43LS4xLTIzLjktMTMuNi0zMy44LTIyLjItMzMuOHptLTQxMy41IDYzLjdjLTMuMS42LTYuMi44LTkuMy43LTMwLjUtLjktNjMuNS0yOC4zLTY2LjgtNjAuOS0zLjYtMzYgMTQuOC02My43IDQ3LjQtNzAuMyAzLjktLjggOC42LTEuMyAxMy43LTEgMTguMyAxLjEgNDUuMSAxNS4xIDUxLjMgNTQuOCA1LjQgMzUuMi0zLjMgNzEuMS0zNi4zIDc2Ljd6bS0zNC0xNTJjLTE5LjggMy43LTM3LjQgMTQuOS00OS4xIDMxLjMtNi42LTUuNS0xOC43LTE2LTIwLjktMjAuMS0xNy41LTMzLjEgMTktOTcuNiA0NC42LTEzNCA2My04OS45IDE2MS43LTE1OCAyMDcuNC0xNDUuNyA3LjQgMi4xIDMyIDMwLjcgMzIgMzAuN3MtNDUuNyAyNS4zLTg4LjEgNjAuNmMtNTcgNDQtMTAwLjIgMTA3LjktMTI1LjkgMTc3LjJ6bTExNi4zLTEyMy4yYzIyLjQtMjUuOSA1MC00OC40IDc0LjctNjEgLjgtLjUgMS43LjUgMS4zIDEuMy0zIDUuMy01LjQgMTEtNi45IDE2LjktLjIuOS44IDEuNiAxLjUgMS4xIDE1LjQtMTAuNSA0Mi4xLTIxLjcgNjUuNi0yMy4xLjUtLjEgMS4xLjMgMS4yLjguMS40LS4xLjgtLjUgMS0zLjkgMy03LjQgNi41LTEwLjMgMTAuNGExIDEgMCAwIDAgLjggMS42YzE2LjUuMSAzOS43IDUuOCA1NC44IDE0LjMgMSAuNi4zIDIuNi0uOCAyLjMtMjIuOS01LjItNjAuNC05LjItOTkuMy4zLTM0LjggOC41LTYxLjMgMjEuNS04MC42IDM1LjYtMS4xLjctMi4zLS42LTEuNS0xLjV6bTMzMi4yIDI1My4zYy00LjQgMjYuNi0xNS43IDQ4LjItMzQuNyA2OC0xMS44IDEyLjktMjYgMjMuNC00MS42IDMxLjEtOC43IDQuNi0xNy44IDguNC0yNy4xIDExLjUtNzEuNiAyMy40LTE0NS0yLjMtMTY4LjYtNTcuNi0xLjktNC4yLTMuNS04LjYtNC43LTEzLjEtMTAuMS0zNi40LTEuNS04MCAyNS4yLTEwNy41IDEuNy0xLjcgMy40LTMuOCAzLjQtNi40IDAtMi4xLTEuNC00LjQtMi42LTYuMS05LjMtMTMuNS00MS44LTM2LjYtMzUuMi04MS4zIDQuNi0zMi4xIDMyLjctNTQuNyA1OC45LTUzLjRsNi43LjRjMTEuMy43IDIxLjIgMi4xIDMwLjYgMi41IDE1LjcuNiAyOS43LTEuNiA0Ni40LTE1LjUgNS42LTQuNyAxMC4xLTguOCAxNy43LTEwIC44LS4yIDIuOC0uOCA2LjgtLjcgNC4xLjIgOCAxLjQgMTEuNCAzLjYgMTMuMyA4LjkgMTUuMiAzMC40IDE2IDQ2LjIuNCA5IDEuNSAzMC43IDEuOCAzNi45LjkgMTQuMyA0LjYgMTYuMyAxMi4yIDE4LjggNC4zIDEuNSA4LjMgMi41IDE0LjEgNC4yIDE3LjYgNC45IDI4LjIgMTAgMzQuOCAxNi40IDMuNCAzLjMgNS42IDcuNyA2LjMgMTIuNCAyLjIgMTUuMi0xMS44IDM0LTQ4LjUgNTEuMS00MC4yIDE4LjYtODkgMjMuNC0xMjIuNiAxOS42bC0xMS44LTEuM2MtMjctMy42LTQyLjMgMzEuMi0yNi4xIDU1IDEwLjQgMTUuNCAzOC44IDI1LjQgNjcuMiAyNS40IDY1LjEuMSAxMTUuMi0yNy43IDEzMy44LTUxLjhsMS41LTIuMWMuOS0xLjQuMi0yLjEtMS0xLjQtMTUuMiAxMC40LTgyLjggNTEuNy0xNTUgMzkuMyAwIDAtOC44LTEuNS0xNi44LTQuNi02LjMtMi40LTE5LjctOC42LTIxLjMtMjIuMyA1OC4yIDE4LjEgOTUgMSA5NSAxIC43LS4zIDEuMS0xIDEtMS44LS4xLS45LS45LTEuNi0xLjgtMS41aC0uMXMtNDcuOCA3LjEtOTMtOS40YzQuOS0xNiAxOC0xMC4zIDM3LjgtOC42IDMwLjcgMS44IDYxLjUtMS41IDkxLjItOS45IDIwLjQtNS45IDQ3LjMtMTcuNSA2OC4yLTMzLjkgNy4xIDE1LjUgOS41IDMyLjUgOS41IDMyLjVzNS40LTEgMTAgMS44YzQgMi44IDcuMSA4LjMgNSAyMi41eiIvPjwvc3ZnPg=='; + $mailchimp_icon = 'data:image/svg+xml;base64,'.$this->mailchimp_svg(); add_menu_page( __( 'Mailchimp for WooCommerce', 'mailchimp-for-woocommerce' ), @@ -285,7 +286,7 @@ public function setup_survey_form() { * @return string */ protected function mailchimp_svg() { - return base64_encode( 'Asset 1' ); + return base64_encode('Asset 1'); } /** diff --git a/includes/class-mailchimp-woocommerce.php b/includes/class-mailchimp-woocommerce.php index d488460c..908eb3d0 100644 --- a/includes/class-mailchimp-woocommerce.php +++ b/includes/class-mailchimp-woocommerce.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'); From 4051a9100dd4b32bec891a9278aaafb1efccdff3 Mon Sep 17 00:00:00 2001 From: Ryan Hungate Date: Fri, 10 May 2024 16:19:16 -0400 Subject: [PATCH 5/7] fixed the wordpress options being saved on oauth api key issue --- admin/class-mailchimp-woocommerce-admin.php | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/admin/class-mailchimp-woocommerce-admin.php b/admin/class-mailchimp-woocommerce-admin.php index 81276a1b..6e740f4d 100644 --- a/admin/class-mailchimp-woocommerce-admin.php +++ b/admin/class-mailchimp-woocommerce-admin.php @@ -73,8 +73,8 @@ private function disconnect_store() { $webhooks = new MailChimp_WooCommerce_WebHooks_Sync; $webhooks->cleanHooks(true); - // clean database - mailchimp_clean_database(); + // clean database + mailchimp_clean_database(); return array(); } @@ -989,6 +989,8 @@ public function mailchimp_woocommerce_ajax_oauth_status() { * Mailchimp OAuth connection finish */ public function mailchimp_woocommerce_ajax_oauth_finish() { + global $wpdb; + //mailchimp_log('admin', 'right before middleware oauth finish'); $this->adminOnlyMiddleware(); //mailchimp_log('admin', 'right after middleware oauth finish'); @@ -1007,7 +1009,7 @@ public function mailchimp_woocommerce_ajax_oauth_finish() { $response = wp_remote_post( 'https://woocommerce.mailchimpapp.com/api/finish', $pload ); - //mailchimp_log('admin', "finished oauth", array('response' => $response)); + mailchimp_log('admin', "finished oauth"); // need to return the error message if this is the problem. if ( $response instanceof WP_Error ) { @@ -1015,15 +1017,26 @@ public function mailchimp_woocommerce_ajax_oauth_finish() { } if ( $response['response']['code'] == 200 ) { + + delete_option('mailchimp-woocommerce-account_name'); + delete_option('mailchimp-woocommerce-cached-api-lists'); + delete_option('mailchimp-woocommerce-validation.newsletter_settings'); + delete_option('mailchimp-woocommerce-cached-api-ping-check'); + delete_option('mailchimp-woocommerce-validation.api.ping'); + delete_site_transient( 'mailchimp-woocommerce-oauth-secret' ); // save api_key? If yes, we can skip api key validation for validatePostApiKey(); $result = json_decode( $response['body'], true); $options = get_option($this->plugin_name); $options['mailchimp_api_key'] = $result['access_token'].'-'.$result['data_center']; - //mailchimp_log('admin', "got access token - updating options", array('response' => $response['body'])); - - update_option( $this->plugin_name, $options ); + // update_option($this->plugin_name, $options); this used to return false! + // go straight to the DB and update the options to bypass any filters. + $wpdb->update( + $wpdb->options, + array('option_value' => maybe_serialize($options)), + array('option_name' => $this->plugin_name) + ); wp_send_json_success( $response ); } else { @@ -1032,7 +1045,6 @@ public function mailchimp_woocommerce_ajax_oauth_finish() { } - public function mailchimp_woocommerce_ajax_create_account_check_username() { $this->adminOnlyMiddleware(); From 85c896f3bcf1079963a63166c6db3fff0b3ccf53 Mon Sep 17 00:00:00 2001 From: jordanriii Date: Mon, 13 May 2024 12:20:41 -0400 Subject: [PATCH 6/7] qa text files updates v4.0.2 --- CHANGELOG.txt | 5 +++-- README.txt | 6 +++--- mailchimp-woocommerce.php | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1942e728..91b3281c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,7 +1,8 @@ == Changelog == = 4.0.2 = -* Changelog in UI -* UI updates +* 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 diff --git a/README.txt b/README.txt index 65ce77ed..e80f1559 100644 --- a/README.txt +++ b/README.txt @@ -79,6 +79,6 @@ If you are unable to sync or connect with Mailchimp, you can open a ticket on ou == Changelog == = 4.0.2 = -* Changelog in UI -* UI updates - +* adds the Changelog back to the UI +* tested up to Woocommerce v8.9 +* fixed connection issue when disconnecting and reconnecting diff --git a/mailchimp-woocommerce.php b/mailchimp-woocommerce.php index e223283d..bdcc6a64 100644 --- a/mailchimp-woocommerce.php +++ b/mailchimp-woocommerce.php @@ -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. From 3dd126c3a0f28ffdac641471678af33057986ffc Mon Sep 17 00:00:00 2001 From: Ryan Hungate Date: Mon, 13 May 2024 13:26:37 -0400 Subject: [PATCH 7/7] tested up to --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index e80f1559..6d16536a 100644 --- a/README.txt +++ b/README.txt @@ -7,7 +7,7 @@ Tested up to: 6.5 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.