Skip to content

Commit

Permalink
Merge pull request #1142 from mailchimp/4.0.1
Browse files Browse the repository at this point in the history
4.0.1
  • Loading branch information
ryanhungate authored Apr 22, 2024
2 parents b16e89d + 87feed9 commit ab54f27
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
== Changelog ==
= 4.0.1 =
* Log changes
* Add audience name to overview
= 4.0 =
* Allow orders to be sent to Mailchimp even if a Wordpress user role isn't set
* Support for custom order IDs
Expand Down
10 changes: 4 additions & 6 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Stable tag: 4.0.1
Requires PHP: 7.4
WC requires at least: 4.2
WC tested up to: 8.8
Expand Down Expand Up @@ -78,9 +78,7 @@ At this time, the synchronization of product categories from WooCommerce to Mail
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 =
* Allow orders to be sent to Mailchimp even if a Wordpress user role isn't set
* Support for custom order IDs
* Updated dependabot issues related to block-based checkouts
* Refreshed plugin interface
= 4.0.1 =
* Log changes
* Add audience name to overview

10 changes: 5 additions & 5 deletions admin/class-mailchimp-woocommerce-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -988,9 +988,9 @@ public function mailchimp_woocommerce_ajax_oauth_status() {
* Mailchimp OAuth connection finish
*/
public function mailchimp_woocommerce_ajax_oauth_finish() {
mailchimp_log('admin', 'right before middleware oauth finish');
//mailchimp_log('admin', 'right before middleware oauth finish');
$this->adminOnlyMiddleware();
mailchimp_log('admin', 'right after middleware oauth finish');
//mailchimp_log('admin', 'right after middleware oauth finish');
$args = array(
'domain' => site_url(),
'secret' => get_site_transient( 'mailchimp-woocommerce-oauth-secret' ),
Expand All @@ -1006,7 +1006,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", array('response' => $response));

// need to return the error message if this is the problem.
if ( $response instanceof WP_Error ) {
Expand All @@ -1020,7 +1020,7 @@ public function mailchimp_woocommerce_ajax_oauth_finish() {
$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']));
//mailchimp_log('admin', "got access token - updating options", array('response' => $response['body']));

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

Expand Down Expand Up @@ -1833,7 +1833,7 @@ public function inject_sync_ajax_call() {
* @return false|mixed|null
*/
private function updateMailChimpList( $data = null, $list_id = null ) {
mailchimp_log('admin', 'updating mailchimp list', array('data' => $data));
//mailchimp_log('admin', 'updating mailchimp list', array('data' => $data));
if ( empty( $data ) ) {
$data = $this->getOptions();
}
Expand Down
5 changes: 5 additions & 0 deletions admin/v2/templates/confirmation/tabs/overview.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@
<?php esc_html_e($is_done_syncing ? 'Complete' : 'Syncing', 'mailchimp-for-woocommerce' ); ?>
</span>
</div>
<div class="sync-status-text">
<span style="text-align:center;">
<?php esc_html_e($audience_name, 'mailchimp-for-woocommerce' ); ?>
</span>
</div>
<div class="sync-status-time <?php if ( !$last_updated_time ) { echo "mc-wc-d-none"; } ?>">
<span class="sync-status-time-date">
<?php esc_html_e('Last sync', 'mailchimp-for-woocommerce' ); ?>
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function mailchimp_environment_variables() {
return (object) array(
'repo' => 'master',
'environment' => 'production', // staging or production
'version' => '4.0',
'version' => '4.0.1',
'php_version' => phpversion(),
'wp_version' => (empty($wp_version) ? 'Unknown' : $wp_version),
'wc_version' => function_exists('WC') ? WC()->version : null,
Expand Down
2 changes: 1 addition & 1 deletion mailchimp-woocommerce.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
* Version: 4.0.1
* Author: Mailchimp
* Author URI: https://mailchimp.com
* License: GPL-2.0+
Expand Down

0 comments on commit ab54f27

Please sign in to comment.