Merge branch 'develop' into master

mailchimp · Jul 22, 2019 · b613647 · b613647
2 parents 98c1456 + 5a854c0
commit b613647
Show file tree

Hide file tree

Showing 9 changed files with 171 additions and 39 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Helper/Data.php b/app/code/community/Ebizmarts/MailChimp/Helper/Data.php
@@ -315,7 +315,7 @@ public function isMailChimpEnabled($scopeId, $scope = null)
      */
     public function isUseMagentoEmailsEnabled($scopeId)
     {
-        return $this->getConfigValueForScope(Ebizmarts_MailChimp_Model_Config::GENERAL_MAGENTO_MAIL, $scopeId);
+        return (int) $this->getConfigValueForScope(Ebizmarts_MailChimp_Model_Config::GENERAL_MAGENTO_MAIL, $scopeId);
     }
 
     /**
@@ -2825,7 +2825,7 @@ public function updateSubscriberSyndData($itemId, $syncDelta = null, $syncError
             if ($syncDeleted) {
                 $subscriber->setData("mailchimp_sync_deleted", $syncDeleted);
             }
-            $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE);
+            $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE);
             $subscriber->save();
         }
     }
@@ -3510,7 +3510,7 @@ public function unsubscribeMember($subscriber)
     protected function setMemberGeneralData($subscriber)
     {
         $subscriber->setImportMode(true);
-        $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE);
+        $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE);
         $subscriber->setIsStatusChanged(true);
         $subscriber->save();
     }

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers.php
@@ -117,7 +117,7 @@ public function createBatchJson($listId, $storeId, $limit)
                 $subscriber->setData("mailchimp_sync_delta", Varien_Date::now());
                 $subscriber->setData("mailchimp_sync_error", "");
                 $subscriber->setData("mailchimp_sync_modified", 0);
-                $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE);
+                $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE);
                 $subscriber->save();
             }
 
@@ -288,7 +288,7 @@ public function updateSubscriber($subscriber, $updateStatus = false)
             }
 
             if ($saveSubscriber) {
-                $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE);
+                $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE);
                 $subscriber->save();
             }
         }

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Observer.php b/app/code/community/Ebizmarts/MailChimp/Model/Observer.php
@@ -179,15 +179,17 @@ protected function isListXorStoreInherited($configData)
     public function subscriberSaveBefore(Varien_Event_Observer $observer)
     {
         $subscriber = $observer->getEvent()->getSubscriber();
+        $subscriberSource = $subscriber->getSubscriberSource();
         $storeId = $subscriber->getStoreId();
         $helper = $this->makeHelper();
         $isEnabled = $helper->isSubscriptionEnabled($storeId);
 
-        if ($isEnabled && $subscriber->getSubscriberSource() != Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE) {
+        if ($isEnabled && !$this->isMailchimpSave($subscriberSource)) {
             $statusChanged = $subscriber->getIsStatusChanged();
 
             //Override Magento status to always send double opt-in confirmation.
-            if ($statusChanged && $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED && $helper->isSubscriptionConfirmationEnabled($storeId) && !$helper->isUseMagentoEmailsEnabled($storeId)) {
+            if ($statusChanged && $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED &&
+                $helper->isSubscriptionConfirmationEnabled($storeId) && !$helper->isUseMagentoEmailsEnabled($storeId)) {
                 $subscriber->setStatus(Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE);
                 $this->addSuccessIfRequired($helper);
             }
@@ -210,16 +212,19 @@ public function subscriberSaveAfter(Varien_Event_Observer $observer)
         $storeViewId = $this->getStoreViewIdBySubscriber($subscriber);
         $helper = $this->makeHelper();
         $isEnabled = $helper->isSubscriptionEnabled($storeViewId);
+        $subscriberSource = $subscriber->getSubscriberSource();
 
-        if ($isEnabled && $subscriber->getSubscriberSource() != Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE) {
+        if ($isEnabled && !$this->isMailchimpSave($subscriberSource)) {
             $params = $this->getRequest()->getParams();
             $helper->saveInterestGroupData($params, $storeViewId, null, $subscriber);
 
             $this->createEmailCookie($subscriber);
 
-            if ($helper->isUseMagentoEmailsEnabled($storeViewId) != 1) {
-                $apiSubscriber = $this->makeApiSubscriber();
+            $apiSubscriber = $this->makeApiSubscriber();
 
+            if ($helper->isUseMagentoEmailsEnabled($storeViewId) !== 1
+                && $this->isMagentoSubscription($subscriberSource)
+                || $this->isEmailConfirmationRequired($subscriberSource)) {
                 if ($subscriber->getIsStatusChanged()) {
                     $apiSubscriber->updateSubscriber($subscriber, true);
                 } else {
@@ -1167,4 +1172,31 @@ protected function getStoreViewIdBySubscriber($subscriber)
         return $storeViewId;
     }
 
+    /**
+     * @param string $subscriberSource
+     * @return bool
+     */
+    protected function isEmailConfirmationRequired($subscriberSource)
+    {
+        return $subscriberSource === Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_CONFIRMATION;
+    }
+
+    /**
+     * @param string $subscriberSource
+     * @return bool
+     */
+    protected function isMagentoSubscription($subscriberSource)
+    {
+        return empty($subscriberSource);
+    }
+
+    /**
+     * @param string $subscriberSource
+     * @return bool
+     */
+    protected function isMailchimpSave($subscriberSource)
+    {
+        return $subscriberSource === Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE;
+    }
+
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php b/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
@@ -102,7 +102,7 @@ protected function _updateEmail(array $data)
             if (!$newSubscriber->getId()) {
                 if ($oldSubscriber->getId()) {
                     $oldSubscriber->setSubscriberEmail($new);
-                    $oldSubscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE);
+                    $oldSubscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE);
                     $oldSubscriber->save();
                 } else {
                     $helper->subscribeMember($newSubscriber);
@@ -236,7 +236,7 @@ public function _profile(array $data)
                         $saveRequired = true;
                     }
                     if ($saveRequired) {
-                        $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE);
+                        $subscriber->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::MAILCHIMP_SUBSCRIBE);
                         $subscriber->save();
                     }
                 } else {

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Subscriber.php b/app/code/community/Ebizmarts/MailChimp/Model/Subscriber.php
@@ -8,7 +8,8 @@
  */
 class Ebizmarts_MailChimp_Model_Subscriber extends Mage_Newsletter_Model_Subscriber
 {
-    const SUBSCRIBE_SOURCE = 'MailChimp';
+    const MAILCHIMP_SUBSCRIBE = 'MailChimp';
+    const SUBSCRIBE_CONFIRMATION = 'MailChimp_Confirmation';
 
     public function sendUnsubscriptionEmail()
     {
@@ -42,7 +43,7 @@ public function confirm($code)
         if ($this->getCode()==$code) {
             $this->setStatus(self::STATUS_SUBSCRIBED)
                 ->setIsStatusChanged(true)
-                ->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_SOURCE)
+                ->setSubscriberSource(Ebizmarts_MailChimp_Model_Subscriber::SUBSCRIBE_CONFIRMATION)
                 ->save();
             return true;
         }

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/WebhookDelete.php b/app/code/community/Ebizmarts/MailChimp/Model/System/Config/Source/WebhookDelete.php
@@ -18,9 +18,11 @@ class Ebizmarts_MailChimp_Model_System_Config_Source_WebhookDelete
      */
     public function toOptionArray()
     {
+        $mailchimpHelper = Mage::helper('mailchimp');
+
         return array(
-            array('value' => 0, 'label' => Mage::helper('mailchimp')->__('Unsubscribe customers')),
-            array('value' => 1, 'label' => Mage::helper('mailchimp')->__('Delete customer account'))
+            array('value' => 0, 'label' => $mailchimpHelper->__('Unsubscribe')),
+            array('value' => 1, 'label' => $mailchimpHelper->__('Delete subscriber'))
         );
     }
 }
diff --git a/app/code/community/Ebizmarts/MailChimp/etc/system.xml b/app/code/community/Ebizmarts/MailChimp/etc/system.xml
@@ -219,6 +219,15 @@
                             <show_in_store>1</show_in_store>
                             <comment><![CDATA[Click this button to create the webhook manually, it will only work if the webhook doesn't already exist.]]></comment>
                         </create_webhook>
+                        <webhook_delete translate="label">
+                            <label>Webhook Delete Subscriber Action</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>mailchimp/system_config_source_webhookDelete</source_model>
+                            <sort_order>59</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </webhook_delete>
                         <webhook_active translate="label comment">
                             <label>Enable Two Way Sync</label>
                             <frontend_type>select</frontend_type>
@@ -242,15 +251,6 @@
                             <can_be_empty>1</can_be_empty>
                             <comment><![CDATA[If you enable this Magento confirmation email will be sent for subscribers instead of Mailchimp email.]]></comment>
                         </magento_mail>
-                        <webhook_delete translate="label">
-                            <label>Webhooks Delete action</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>mailchimp/system_config_source_webhookDelete</source_model>
-                            <sort_order>70</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>1</show_in_store>
-                        </webhook_delete>
                         <enable_log translate="label comment">
                             <label>Enable Log</label>
                             <frontend_type>select</frontend_type>