fix #7 and #8

digitalpianism · Nov 9, 2016 · 9dce7a7 · 9dce7a7
1 parent e580290
commit 9dce7a7
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/app/code/community/DigitalPianism/Abandonedcarts/Model/Notifier.php b/app/code/community/DigitalPianism/Abandonedcarts/Model/Notifier.php
@@ -38,6 +38,11 @@ class DigitalPianism_Abandonedcarts_Model_Notifier extends Mage_Core_Model_Abstr
 	 */
 	protected $_currentStoreId;
 
+	/**
+	 * @var
+	 */
+	protected $_originalArea;
+
 	/**
 	 * @var
 	 */
@@ -273,6 +278,12 @@ protected function _sendSaleEmails($dryrun, $testemail)
 
 			// Store Id
 			Mage::app()->setCurrentStore($recipient['store_id']);
+			// Area
+			if ($recipient['store_id'] === 0) {
+				Mage::app()->getDesign()->setArea('adminhtml');
+			} else {
+				Mage::app()->getDesign()->setArea('frontend');
+			}
 			// Get the transactional email template
 			$templateId = Mage::getStoreConfig('abandonedcartsconfig/email/email_template_sale');
 			// Get the sender
@@ -360,6 +371,16 @@ protected function _sendEmails($dryrun, $testemail)
 
 			// Store ID
 			Mage::app()->setCurrentStore($recipient['store_id']);
+			// Area
+			if ($recipient['store_id'] === 0) {
+				Mage::app()->getDesign()->setArea('adminhtml');
+			} else {
+				Mage::app()->getDesign()->setArea('frontend');
+			}
+
+			if ($recipient['store_id']) {
+				Mage::app()->set
+			}
 			// Get the transactional email template
 			$templateId = Mage::getStoreConfig('abandonedcartsconfig/email/email_template');
 			// Get the sender
@@ -449,6 +470,8 @@ public function sendAbandonedCartsSaleEmail($dryrun = false, $testemail = null,
 		$this->_customerGroups = $this->_customerGroups ? $this->_customerGroups : Mage::helper('abandonedcarts')->getCustomerGroupsLimitation();
 		// Original store id
 		$this->_originalStoreId = Mage::app()->getStore()->getId();
+		// Original area
+		$this->_originalArea = Mage::app()->getDesign()->getArea();
 		try
 		{
 			if (Mage::helper('abandonedcarts')->isSaleEnabled()) {
@@ -489,12 +512,14 @@ public function sendAbandonedCartsSaleEmail($dryrun = false, $testemail = null,
 				}
 				$this->_sendSaleEmails($dryrun, $testemail);
 			}
+			Mage::app()->getDesign()->setArea($this->_originalArea);
 			Mage::app()->setCurrentStore($this->_originalStoreId);
 
 			return count($this->_getSaleRecipients());
 		}
 		catch (Exception $e)
 		{
+			Mage::app()->getDesign()->setArea($this->_originalArea);
 			Mage::app()->setCurrentStore($this->_originalStoreId);
 			Mage::helper('abandonedcarts')->log(sprintf("%s->Error: %s", __METHOD__, $e->getMessage()));
 			return 0;
@@ -522,6 +547,8 @@ public function sendAbandonedCartsEmail($nodate = false, $dryrun = false, $teste
 		$this->_customerGroups = $this->_customerGroups ? $this->_customerGroups : Mage::helper('abandonedcarts')->getCustomerGroupsLimitation();
 		// Original store id
 		$this->_originalStoreId = Mage::app()->getStore()->getId();
+		// Original area
+		$this->_originalArea = Mage::app()->getDesign()->getArea();
 		try
 		{
 			if (Mage::helper('abandonedcarts')->isEnabled()) {
@@ -575,12 +602,14 @@ public function sendAbandonedCartsEmail($nodate = false, $dryrun = false, $teste
 				// Send the emails
 				$this->_sendEmails($dryrun, $testemail);
 			}
+			Mage::app()->getDesign()->setArea($this->_originalArea);
 			Mage::app()->setCurrentStore($this->_originalStoreId);
 
 			return count($this->_getRecipients());
 		}
 		catch (Exception $e)
 		{
+			Mage::app()->getDesign()->setArea($this->_originalArea);
 			Mage::app()->setCurrentStore($this->_originalStoreId);
 			Mage::helper('abandonedcarts')->log(sprintf("%s->Error: %s", __METHOD__, $e->getMessage()));
 			return 0;