Skip to content

Commit ab54f27

Browse files
authored
Merge pull request #1142 from mailchimp/4.0.1
4.0.1
2 parents b16e89d + 87feed9 commit ab54f27

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

CHANGELOG.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
== Changelog ==
2+
= 4.0.1 =
3+
* Log changes
4+
* Add audience name to overview
25
= 4.0 =
36
* Allow orders to be sent to Mailchimp even if a Wordpress user role isn't set
47
* Support for custom order IDs

README.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: ecommerce,email,workflows,mailchimp
44
Donate link: https://mailchimp.com
55
Requires at least: 4.9
66
Tested up to: 6.5
7-
Stable tag: 4.0
7+
Stable tag: 4.0.1
88
Requires PHP: 7.4
99
WC requires at least: 4.2
1010
WC tested up to: 8.8
@@ -78,9 +78,7 @@ At this time, the synchronization of product categories from WooCommerce to Mail
7878
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.
7979

8080

81-
= 4.0 =
82-
* Allow orders to be sent to Mailchimp even if a Wordpress user role isn't set
83-
* Support for custom order IDs
84-
* Updated dependabot issues related to block-based checkouts
85-
* Refreshed plugin interface
81+
= 4.0.1 =
82+
* Log changes
83+
* Add audience name to overview
8684

admin/class-mailchimp-woocommerce-admin.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -988,9 +988,9 @@ public function mailchimp_woocommerce_ajax_oauth_status() {
988988
* Mailchimp OAuth connection finish
989989
*/
990990
public function mailchimp_woocommerce_ajax_oauth_finish() {
991-
mailchimp_log('admin', 'right before middleware oauth finish');
991+
//mailchimp_log('admin', 'right before middleware oauth finish');
992992
$this->adminOnlyMiddleware();
993-
mailchimp_log('admin', 'right after middleware oauth finish');
993+
//mailchimp_log('admin', 'right after middleware oauth finish');
994994
$args = array(
995995
'domain' => site_url(),
996996
'secret' => get_site_transient( 'mailchimp-woocommerce-oauth-secret' ),
@@ -1006,7 +1006,7 @@ public function mailchimp_woocommerce_ajax_oauth_finish() {
10061006

10071007
$response = wp_remote_post( 'https://woocommerce.mailchimpapp.com/api/finish', $pload );
10081008

1009-
mailchimp_log('admin', "finished oauth", array('response' => $response));
1009+
//mailchimp_log('admin', "finished oauth", array('response' => $response));
10101010

10111011
// need to return the error message if this is the problem.
10121012
if ( $response instanceof WP_Error ) {
@@ -1020,7 +1020,7 @@ public function mailchimp_woocommerce_ajax_oauth_finish() {
10201020
$options = get_option($this->plugin_name);
10211021
$options['mailchimp_api_key'] = $result['access_token'].'-'.$result['data_center'];
10221022

1023-
mailchimp_log('admin', "got access token - updating options", array('response' => $response['body']));
1023+
//mailchimp_log('admin', "got access token - updating options", array('response' => $response['body']));
10241024

10251025
update_option( $this->plugin_name, $options );
10261026

@@ -1833,7 +1833,7 @@ public function inject_sync_ajax_call() {
18331833
* @return false|mixed|null
18341834
*/
18351835
private function updateMailChimpList( $data = null, $list_id = null ) {
1836-
mailchimp_log('admin', 'updating mailchimp list', array('data' => $data));
1836+
//mailchimp_log('admin', 'updating mailchimp list', array('data' => $data));
18371837
if ( empty( $data ) ) {
18381838
$data = $this->getOptions();
18391839
}

admin/v2/templates/confirmation/tabs/overview.php

+5
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@
142142
<?php esc_html_e($is_done_syncing ? 'Complete' : 'Syncing', 'mailchimp-for-woocommerce' ); ?>
143143
</span>
144144
</div>
145+
<div class="sync-status-text">
146+
<span style="text-align:center;">
147+
<?php esc_html_e($audience_name, 'mailchimp-for-woocommerce' ); ?>
148+
</span>
149+
</div>
145150
<div class="sync-status-time <?php if ( !$last_updated_time ) { echo "mc-wc-d-none"; } ?>">
146151
<span class="sync-status-time-date">
147152
<?php esc_html_e('Last sync', 'mailchimp-for-woocommerce' ); ?>

bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function mailchimp_environment_variables() {
9696
return (object) array(
9797
'repo' => 'master',
9898
'environment' => 'production', // staging or production
99-
'version' => '4.0',
99+
'version' => '4.0.1',
100100
'php_version' => phpversion(),
101101
'wp_version' => (empty($wp_version) ? 'Unknown' : $wp_version),
102102
'wc_version' => function_exists('WC') ? WC()->version : null,

mailchimp-woocommerce.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Plugin Name: Mailchimp for WooCommerce
1717
* Plugin URI: https://mailchimp.com/connect-your-store/
1818
* Description: Connects WooCommerce to Mailchimp to sync your store data, send targeted campaigns to your customers, and sell more stuff.
19-
* Version: 4.0
19+
* Version: 4.0.1
2020
* Author: Mailchimp
2121
* Author URI: https://mailchimp.com
2222
* License: GPL-2.0+

0 commit comments

Comments
 (0)