Merge pull request #717 from mailchimp/Issue715-2.3

closes #715 for magento 2.3
mailchimp · May 21, 2019 · 62f1f14 · 62f1f14
2 parents 4e9f610 + 27ba584
commit 62f1f14
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Model/Plugin/Subscriber.php b/Model/Plugin/Subscriber.php
@@ -70,12 +70,14 @@ public function beforeUnsubscribeCustomerById(
         $storeId = $this->getStoreIdFromSubscriber($subscriber);
         if ($this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_ACTIVE, $storeId)) {
             $subscriber->loadByCustomerId($customerId);
-            $api = $this->_helper->getApi($storeId);
-            try {
-                $md5HashEmail = md5(strtolower($subscriber->getSubscriberEmail()));
-                $api->lists->members->update($this->_helper->getDefaultList($storeId), $md5HashEmail, null, 'unsubscribed');
-            } catch (\Mailchimp_Error $e) {
-                $this->_helper->log($e->getFriendlyMessage());
+            if ($subscriber->isSubscribed()) {
+                $api = $this->_helper->getApi($storeId);
+                try {
+                    $md5HashEmail = md5(strtolower($subscriber->getSubscriberEmail()));
+                    $api->lists->members->update($this->_helper->getDefaultList($storeId), $md5HashEmail, null, 'unsubscribed');
+                } catch (\Mailchimp_Error $e) {
+                    $this->_helper->log($e->getFriendlyMessage());
+                }
             }
         }
         return [$customerId];
@@ -114,9 +116,7 @@ public function beforeSubscribeCustomerById(
                     }
                     try {
                         $emailHash = md5(strtolower($customer->getEmail()));
-                        if (!$subscriber->getMailchimpId()) {
-                            $return = $api->lists->members->addOrUpdate($this->_helper->getDefaultList($storeId), $emailHash, null, $status, $mergeVars, null, null, null, null, $email, $status);
-                        }
+                        $api->lists->members->addOrUpdate($this->_helper->getDefaultList($storeId), $emailHash, null, $status, $mergeVars, null, null, null, null, $email, $status);
                     } catch (\Mailchimp_Error $e) {
                         $this->_helper->log($e->getFriendlyMessage());
                     }