Problem with re-subscription breaking the checkout solved.

ebizmarts · Sep 8, 2016 · 3c371ce · 3c371ce
1 parent b5ef7d7
commit 3c371ce
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php b/app/code/community/Ebizmarts/MageMonkey/Model/Observer.php
@@ -46,18 +46,20 @@ public function handleSubscriber(Varien_Event_Observer $observer)
         if (Mage::getSingleton('core/session')->getIsOneStepCheckout() && !Mage::getSingleton('core/session')->getMonkeyCheckout()) {
             return $observer;
         }
-        if (TRUE === $subscriber->getIsStatusChanged()) {
+        if (TRUE === $subscriber->getIsStatusChanged() && !Mage::getSingleton('core/session')->getAlreadySubscribed()) {
             Mage::getSingleton('core/session')->setIsHandleSubscriber(TRUE);
             if (Mage::getSingleton('core/session')->getIsOneStepCheckout() || Mage::getSingleton('core/session')->getMonkeyCheckout()) {
                 $saveOnDb = Mage::helper('monkey')->config('checkout_async');
+                Mage::getSingleton('core/session')->setAlreadySubscribed(true);
                 Mage::helper('monkey')->subscribeToList($subscriber, $saveOnDb);
             } else {
                 $post = Mage::app()->getRequest()->getPost();
                 if (isset($post['email']) || isset($post['magemonkey_subscribe']) && $post['magemonkey_subscribe'] || Mage::getSingleton('core/session')->getIsUpdateCustomer() || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED || $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE) {
                     Mage::helper('monkey')->subscribeToList($subscriber, 0);
                 }
             }
-            Mage::getSingleton('core/session')->setIsHandleSubscriber(FALSE);
+            Mage::getSingleton('core/session')->setAlreadySubscribed(false);
+            Mage::getSingleton('core/session')->setIsHandleSubscriber(false);
         }
         return $observer;
     }