add control to use magento emails configuration

closes mailchimp#372
maximbaibakov · Oct 11, 2018 · 222ff0f · 222ff0f
1 parent 6c4a6b9
commit 222ff0f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Model/Plugin/Subscriber.php b/Model/Plugin/Subscriber.php
@@ -77,7 +77,9 @@ public function beforeSubscribeCustomerById(
         if($this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_ACTIVE,$subscriber->getStoreId())) {
             $subscriber->loadByCustomerId($customerId);
             if (!$subscriber->isSubscribed()) {
-                $subscriber->setImportMode(true);
+                if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL,$subscriber->getStoreId())) {
+                    $subscriber->setImportMode(true);
+                }
                 $storeId = $subscriber->getStoreId();
                 if ($this->_helper->isMailChimpEnabled($storeId)) {
                     $customer = $this->_customer->getById($customerId);
@@ -110,7 +112,9 @@ public function beforeSubscribe(
         $email
     ) {
         if($this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_ACTIVE,$subscriber->getStoreId())) {
-            $subscriber->setImportMode(true);
+            if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL,$subscriber->getStoreId())) {
+                $subscriber->setImportMode(true);
+            }
             $storeId = $this->_storeManager->getStore()->getId();
 
             if ($this->_helper->isMailChimpEnabled($storeId)) {