Version Notes
Bug fixes for multiple store configuration.
Export fixes for older Enterprise versions.
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | EmailDirect_Integration |
| Version | 1.5.6 |
| Comparing to | |
| See all releases | |
Code changes from version 1.5.5 to 1.5.6
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Export/Range.php +11 -2
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Troubleshooting.php +10 -1
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export.php +5 -0
- app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export/Orders.php +2 -1
- app/code/local/EmailDirect/Integration/Block/Adminhtml/Troubleshooting/View.php +1 -1
- app/code/local/EmailDirect/Integration/Helper/Data.php +69 -18
- app/code/local/EmailDirect/Integration/Model/Observer.php +6 -6
- app/code/local/EmailDirect/Integration/controllers/Admin/ExportController.php +16 -7
- app/code/local/EmailDirect/Integration/controllers/ExportController.php +0 -5
- app/code/local/EmailDirect/Integration/etc/config.xml +1 -1
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/date_range.phtml +2 -2
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/orders.phtml +2 -1
- app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/trouble.phtml +2 -2
- app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export.phtml +29 -27
- app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export_orders.phtml +0 -0
- package.xml +6 -9
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Export/Range.php
CHANGED
|
@@ -26,9 +26,18 @@ class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Export_Ra
|
|
| 26 |
|
| 27 |
public function getOrdersCount()
|
| 28 |
{
|
| 29 |
-
|
|
|
|
|
|
|
|
|
|
| 30 |
|
| 31 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 32 |
}
|
| 33 |
|
| 34 |
|
| 26 |
|
| 27 |
public function getOrdersCount()
|
| 28 |
{
|
| 29 |
+
try
|
| 30 |
+
{
|
| 31 |
+
$store = Mage::helper('emaildirect')->getAdminStore();
|
| 32 |
+
$orders = Mage::helper('emaildirect')->getOrderExportCollection($this->getFromDate(),$this->getToDate(), Mage::helper('emaildirect')->exportConfig('include_already_sent'), $store);
|
| 33 |
|
| 34 |
+
return $orders->getSize();
|
| 35 |
+
}
|
| 36 |
+
catch (Exception $e)
|
| 37 |
+
{
|
| 38 |
+
Mage::logException($e);
|
| 39 |
+
return "Unknown";
|
| 40 |
+
}
|
| 41 |
}
|
| 42 |
|
| 43 |
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Config/Form/Field/Troubleshooting.php
CHANGED
|
@@ -87,9 +87,18 @@ class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Troublesh
|
|
| 87 |
try
|
| 88 |
{
|
| 89 |
$helper = $this->_helper;
|
|
|
|
| 90 |
$file_size = $helper->getLogFileSize();
|
| 91 |
$formatted_size = $helper->formatSize($file_size);
|
| 92 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 93 |
$max_size = $helper->getMaxLogFileSize();
|
| 94 |
|
| 95 |
if ($file_size > $max_size || $file_size == 0)
|
|
@@ -107,7 +116,7 @@ class EmailDirect_Integration_Block_Adminhtml_System_Config_Form_Field_Troublesh
|
|
| 107 |
if ($ago != "")
|
| 108 |
$ago = "<br />({$ago} ago.)";
|
| 109 |
|
| 110 |
-
return $helper->getLogFileName() . " ({$formatted_size}){$last_update}{$ago}";
|
| 111 |
}
|
| 112 |
catch (Exception $e)
|
| 113 |
{
|
| 87 |
try
|
| 88 |
{
|
| 89 |
$helper = $this->_helper;
|
| 90 |
+
|
| 91 |
$file_size = $helper->getLogFileSize();
|
| 92 |
$formatted_size = $helper->formatSize($file_size);
|
| 93 |
|
| 94 |
+
$logging_state = "";
|
| 95 |
+
if (!$helper->isLoggingActive())
|
| 96 |
+
{
|
| 97 |
+
$config_url = $helper->getAdminUrl('adminhtml/system_config/edit/section/dev');
|
| 98 |
+
|
| 99 |
+
$logging_state = "<br /><p class='log_size_warning'>Logging is not enabled for Magento!</p><p>Click <a href='" . $config_url . "'>here</a> to change log settings";
|
| 100 |
+
}
|
| 101 |
+
|
| 102 |
$max_size = $helper->getMaxLogFileSize();
|
| 103 |
|
| 104 |
if ($file_size > $max_size || $file_size == 0)
|
| 116 |
if ($ago != "")
|
| 117 |
$ago = "<br />({$ago} ago.)";
|
| 118 |
|
| 119 |
+
return $helper->getLogFileName() . " ({$formatted_size}){$last_update}{$ago}{$logging_state}";
|
| 120 |
}
|
| 121 |
catch (Exception $e)
|
| 122 |
{
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export.php
CHANGED
|
@@ -68,4 +68,9 @@ class EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export exte
|
|
| 68 |
{
|
| 69 |
return Mage::getSingleton('core/session')->getFormKey();
|
| 70 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
}
|
| 68 |
{
|
| 69 |
return Mage::getSingleton('core/session')->getFormKey();
|
| 70 |
}
|
| 71 |
+
|
| 72 |
+
public function getStore()
|
| 73 |
+
{
|
| 74 |
+
return Mage::app()->getRequest()->getParam('store');
|
| 75 |
+
}
|
| 76 |
}
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/System/Convert/Profile/Export/Orders.php
CHANGED
|
@@ -18,8 +18,9 @@ class EmailDirect_Integration_Block_Adminhtml_System_Convert_Profile_Export_Orde
|
|
| 18 |
$from = Mage::app()->getRequest()->getParam('export_from');
|
| 19 |
$to = Mage::app()->getRequest()->getParam('export_to');
|
| 20 |
$include = Mage::app()->getRequest()->getParam('include_already_sent');
|
|
|
|
| 21 |
|
| 22 |
-
$orders = Mage::helper('emaildirect')->getOrderExportCollection($from, $to, $include);
|
| 23 |
|
| 24 |
return $orders;
|
| 25 |
}
|
| 18 |
$from = Mage::app()->getRequest()->getParam('export_from');
|
| 19 |
$to = Mage::app()->getRequest()->getParam('export_to');
|
| 20 |
$include = Mage::app()->getRequest()->getParam('include_already_sent');
|
| 21 |
+
$store = Mage::app()->getRequest()->getParam('store');
|
| 22 |
|
| 23 |
+
$orders = Mage::helper('emaildirect')->getOrderExportCollection($from, $to, $include, $store);
|
| 24 |
|
| 25 |
return $orders;
|
| 26 |
}
|
app/code/local/EmailDirect/Integration/Block/Adminhtml/Troubleshooting/View.php
CHANGED
|
@@ -46,7 +46,7 @@ class EmailDirect_Integration_Block_Adminhtml_Troubleshooting_View extends Mage_
|
|
| 46 |
|
| 47 |
public function getBackUrl()
|
| 48 |
{
|
| 49 |
-
return
|
| 50 |
}
|
| 51 |
|
| 52 |
public function getLogFileName()
|
| 46 |
|
| 47 |
public function getBackUrl()
|
| 48 |
{
|
| 49 |
+
return Mage::helper('emaildirect')->getAdminUrl('adminhtml/system_config/edit/section/emaildirect');
|
| 50 |
}
|
| 51 |
|
| 52 |
public function getLogFileName()
|
app/code/local/EmailDirect/Integration/Helper/Data.php
CHANGED
|
@@ -16,24 +16,61 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 16 |
private $_log_area = "";
|
| 17 |
private $_current_store = null;
|
| 18 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
public function setCurrentStore($store)
|
| 20 |
{
|
| 21 |
$this->_current_store = $store;
|
| 22 |
}
|
| 23 |
|
| 24 |
-
public function
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 25 |
{
|
| 26 |
$from_date = Mage::getModel('core/date')->gmtDate(null,strtotime($from)); // 2010-05-11 15:00:00
|
| 27 |
|
| 28 |
$to_date = Mage::getModel('core/date')->gmtDate(null,strtotime($to)); // 2010-05-11 15:00:00
|
| 29 |
|
| 30 |
$orders = Mage::getModel('sales/order')->getCollection()
|
| 31 |
-
->addAttributeToFilter('created_at', array('from' => $from_date, 'to' => $to_date))
|
| 32 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 33 |
|
| 34 |
if (!$include)
|
| 35 |
$orders->addAttributeToFilter('sent_to_emaildirect', array('eq' => 0));
|
| 36 |
-
|
| 37 |
return $orders;
|
| 38 |
}
|
| 39 |
|
|
@@ -100,6 +137,9 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 100 |
{
|
| 101 |
$scope = "stores";
|
| 102 |
|
|
|
|
|
|
|
|
|
|
| 103 |
if ($store == 0)
|
| 104 |
$scope = "default";
|
| 105 |
|
|
@@ -111,7 +151,7 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 111 |
public function getCurrentStore()
|
| 112 |
{
|
| 113 |
$store = Mage::app()->getStore()->getId();
|
| 114 |
-
|
| 115 |
$configscope = Mage::app()->getRequest()->getParam('store');
|
| 116 |
|
| 117 |
if ($configscope)
|
|
@@ -119,6 +159,9 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 119 |
else if (!is_null($this->_current_store))
|
| 120 |
$store = $this->_current_store;
|
| 121 |
|
|
|
|
|
|
|
|
|
|
| 122 |
return $store;
|
| 123 |
}
|
| 124 |
|
|
@@ -425,6 +468,22 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 425 |
return "<span class='{$class}'>{$last_run}{$minutes}</span>";
|
| 426 |
}
|
| 427 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 428 |
public function getOrdersEnabled()
|
| 429 |
{
|
| 430 |
$active = $this->config('active');
|
|
@@ -664,20 +723,16 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 664 |
|
| 665 |
public function turnOnTroubleshooting($store = null)
|
| 666 |
{
|
| 667 |
-
// Enabled
|
| 668 |
$date = date(Mage::getModel('core/date')->gmtTimestamp());
|
| 669 |
$date = date("Y-m-d H:i:s", $date);
|
| 670 |
|
| 671 |
-
$this->updateConfig("debug",1,$store);
|
| 672 |
$this->updateConfig("start_date",$date,$store,"troubleshooting");
|
| 673 |
}
|
| 674 |
|
| 675 |
-
public function turnOffTroubleshooting($store)
|
| 676 |
{
|
| 677 |
-
$this->updateConfig("debug",0,$store);
|
| 678 |
$this->updateConfig("start_date","",$store,"troubleshooting");
|
| 679 |
|
| 680 |
-
// RENAME LOG FILE
|
| 681 |
$log_file = $this->getLogFileName();
|
| 682 |
|
| 683 |
if (!file_exists($log_file))
|
|
@@ -697,7 +752,6 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 697 |
|
| 698 |
private function getSubscriberData($data, $email)
|
| 699 |
{
|
| 700 |
-
|
| 701 |
$properties = Mage::getSingleton('emaildirect/wrapper_subscribers')->getProperties($email);
|
| 702 |
$pub_count = 0;
|
| 703 |
$list_count = 0;
|
|
@@ -781,8 +835,6 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 781 |
'disabled' => false);
|
| 782 |
}
|
| 783 |
|
| 784 |
-
//Zend_debug::dump($list_data);
|
| 785 |
-
|
| 786 |
return $list_data;
|
| 787 |
}
|
| 788 |
|
|
@@ -795,7 +847,7 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 795 |
'count' => 0,
|
| 796 |
'list_count' => 0
|
| 797 |
);
|
| 798 |
-
|
| 799 |
$data = $this->getSubscriberData($data, $email);
|
| 800 |
|
| 801 |
return $data;
|
|
@@ -821,17 +873,16 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 821 |
// LOGGING
|
| 822 |
public function log($data, $prefix = "", $area = "")
|
| 823 |
{
|
| 824 |
-
|
|
|
|
|
|
|
| 825 |
{
|
| 826 |
-
$store = $this->getCurrentStore();
|
| 827 |
if ($area == "")
|
| 828 |
$area = $this->_log_area;
|
| 829 |
|
| 830 |
if ($area == self::IGNORE)
|
| 831 |
return;
|
| 832 |
|
| 833 |
-
|
| 834 |
-
|
| 835 |
if (is_array($data) || is_object($data))
|
| 836 |
{
|
| 837 |
if (is_object($data) && get_class($data) == "SimpleXMLElement")
|
| 16 |
private $_log_area = "";
|
| 17 |
private $_current_store = null;
|
| 18 |
|
| 19 |
+
public function getStoreId($code)
|
| 20 |
+
{
|
| 21 |
+
if ($code == null)
|
| 22 |
+
return 0;
|
| 23 |
+
|
| 24 |
+
try
|
| 25 |
+
{
|
| 26 |
+
$store = Mage::getModel("core/store")->load($code);
|
| 27 |
+
return $store->getId();
|
| 28 |
+
}
|
| 29 |
+
catch (Exception $e)
|
| 30 |
+
{
|
| 31 |
+
return 0;
|
| 32 |
+
}
|
| 33 |
+
}
|
| 34 |
+
|
| 35 |
public function setCurrentStore($store)
|
| 36 |
{
|
| 37 |
$this->_current_store = $store;
|
| 38 |
}
|
| 39 |
|
| 40 |
+
public function isLoggingActive($store = null)
|
| 41 |
+
{
|
| 42 |
+
if (is_null($store))
|
| 43 |
+
$store = $this->getCurrentStore();
|
| 44 |
+
|
| 45 |
+
return Mage::getStoreConfig('dev/log/active', $store) == 1;
|
| 46 |
+
}
|
| 47 |
+
|
| 48 |
+
public function getAdminStore()
|
| 49 |
+
{
|
| 50 |
+
$code = Mage::app()->getRequest()->getParam('store');
|
| 51 |
+
|
| 52 |
+
return $this->getStoreId($code);
|
| 53 |
+
}
|
| 54 |
+
|
| 55 |
+
public function getOrderExportCollection($from, $to, $include, $store = null)
|
| 56 |
{
|
| 57 |
$from_date = Mage::getModel('core/date')->gmtDate(null,strtotime($from)); // 2010-05-11 15:00:00
|
| 58 |
|
| 59 |
$to_date = Mage::getModel('core/date')->gmtDate(null,strtotime($to)); // 2010-05-11 15:00:00
|
| 60 |
|
| 61 |
$orders = Mage::getModel('sales/order')->getCollection()
|
| 62 |
+
->addAttributeToFilter('created_at', array('from' => $from_date, 'to' => $to_date));
|
| 63 |
+
|
| 64 |
+
$states = Mage::helper('emaildirect')->config('send_states');
|
| 65 |
+
$state_list = explode(",",$states);
|
| 66 |
+
$orders->addAttributeToFilter('status', array('in' => $state_list));
|
| 67 |
+
|
| 68 |
+
if ($store != null && $store != 0)
|
| 69 |
+
$orders->addAttributeToFilter('store_id', array('eq' => $store));
|
| 70 |
|
| 71 |
if (!$include)
|
| 72 |
$orders->addAttributeToFilter('sent_to_emaildirect', array('eq' => 0));
|
| 73 |
+
|
| 74 |
return $orders;
|
| 75 |
}
|
| 76 |
|
| 137 |
{
|
| 138 |
$scope = "stores";
|
| 139 |
|
| 140 |
+
if ($store == null)
|
| 141 |
+
$store = $this->getCurrentStore();
|
| 142 |
+
|
| 143 |
if ($store == 0)
|
| 144 |
$scope = "default";
|
| 145 |
|
| 151 |
public function getCurrentStore()
|
| 152 |
{
|
| 153 |
$store = Mage::app()->getStore()->getId();
|
| 154 |
+
|
| 155 |
$configscope = Mage::app()->getRequest()->getParam('store');
|
| 156 |
|
| 157 |
if ($configscope)
|
| 159 |
else if (!is_null($this->_current_store))
|
| 160 |
$store = $this->_current_store;
|
| 161 |
|
| 162 |
+
if (is_string($store))
|
| 163 |
+
return $this->getStoreId($store);
|
| 164 |
+
|
| 165 |
return $store;
|
| 166 |
}
|
| 167 |
|
| 468 |
return "<span class='{$class}'>{$last_run}{$minutes}</span>";
|
| 469 |
}
|
| 470 |
|
| 471 |
+
public function getAdminUrl($url)
|
| 472 |
+
{
|
| 473 |
+
$request = Mage::app()->getRequest();
|
| 474 |
+
|
| 475 |
+
$params = array();
|
| 476 |
+
$url_params = array('website','store');
|
| 477 |
+
|
| 478 |
+
foreach ($url_params as $up)
|
| 479 |
+
{
|
| 480 |
+
if ($request->getParam($up))
|
| 481 |
+
$params[$up] = $request->getParam($up);
|
| 482 |
+
}
|
| 483 |
+
|
| 484 |
+
return Mage::helper("adminhtml")->getUrl($url, $params);
|
| 485 |
+
}
|
| 486 |
+
|
| 487 |
public function getOrdersEnabled()
|
| 488 |
{
|
| 489 |
$active = $this->config('active');
|
| 723 |
|
| 724 |
public function turnOnTroubleshooting($store = null)
|
| 725 |
{
|
|
|
|
| 726 |
$date = date(Mage::getModel('core/date')->gmtTimestamp());
|
| 727 |
$date = date("Y-m-d H:i:s", $date);
|
| 728 |
|
|
|
|
| 729 |
$this->updateConfig("start_date",$date,$store,"troubleshooting");
|
| 730 |
}
|
| 731 |
|
| 732 |
+
public function turnOffTroubleshooting($store = null)
|
| 733 |
{
|
|
|
|
| 734 |
$this->updateConfig("start_date","",$store,"troubleshooting");
|
| 735 |
|
|
|
|
| 736 |
$log_file = $this->getLogFileName();
|
| 737 |
|
| 738 |
if (!file_exists($log_file))
|
| 752 |
|
| 753 |
private function getSubscriberData($data, $email)
|
| 754 |
{
|
|
|
|
| 755 |
$properties = Mage::getSingleton('emaildirect/wrapper_subscribers')->getProperties($email);
|
| 756 |
$pub_count = 0;
|
| 757 |
$list_count = 0;
|
| 835 |
'disabled' => false);
|
| 836 |
}
|
| 837 |
|
|
|
|
|
|
|
| 838 |
return $list_data;
|
| 839 |
}
|
| 840 |
|
| 847 |
'count' => 0,
|
| 848 |
'list_count' => 0
|
| 849 |
);
|
| 850 |
+
|
| 851 |
$data = $this->getSubscriberData($data, $email);
|
| 852 |
|
| 853 |
return $data;
|
| 873 |
// LOGGING
|
| 874 |
public function log($data, $prefix = "", $area = "")
|
| 875 |
{
|
| 876 |
+
$store = $this->getCurrentStore();
|
| 877 |
+
|
| 878 |
+
if ($this->troubleConfig('enabled', $store))
|
| 879 |
{
|
|
|
|
| 880 |
if ($area == "")
|
| 881 |
$area = $this->_log_area;
|
| 882 |
|
| 883 |
if ($area == self::IGNORE)
|
| 884 |
return;
|
| 885 |
|
|
|
|
|
|
|
| 886 |
if (is_array($data) || is_object($data))
|
| 887 |
{
|
| 888 |
if (is_object($data) && get_class($data) == "SimpleXMLElement")
|
app/code/local/EmailDirect/Integration/Model/Observer.php
CHANGED
|
@@ -657,12 +657,6 @@ class EmailDirect_Integration_Model_Observer
|
|
| 657 |
$this->_helper->setLogArea(EmailDirect_Integration_Helper_Data::ORDERS);
|
| 658 |
$this->_helper->log("Order Save After Start");
|
| 659 |
|
| 660 |
-
if (!$this->_helper->getOrdersEnabled())
|
| 661 |
-
{
|
| 662 |
-
$this->_helper->logReason($this->_helper->getOrdersDisabledReason());
|
| 663 |
-
return $observer;
|
| 664 |
-
}
|
| 665 |
-
|
| 666 |
$order = $observer->getEvent()->getOrder();
|
| 667 |
|
| 668 |
$this->_helper->log("Order Save After: " . $order->getIncrementId());
|
|
@@ -670,6 +664,12 @@ class EmailDirect_Integration_Model_Observer
|
|
| 670 |
$this->_helper->log("Order Store: " . $order->getStoreId());
|
| 671 |
$this->_helper->setCurrentStore($order->getStoreId());
|
| 672 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 673 |
if (!$this->canSendOrder($order))
|
| 674 |
return $observer;
|
| 675 |
|
| 657 |
$this->_helper->setLogArea(EmailDirect_Integration_Helper_Data::ORDERS);
|
| 658 |
$this->_helper->log("Order Save After Start");
|
| 659 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 660 |
$order = $observer->getEvent()->getOrder();
|
| 661 |
|
| 662 |
$this->_helper->log("Order Save After: " . $order->getIncrementId());
|
| 664 |
$this->_helper->log("Order Store: " . $order->getStoreId());
|
| 665 |
$this->_helper->setCurrentStore($order->getStoreId());
|
| 666 |
|
| 667 |
+
if (!$this->_helper->getOrdersEnabled())
|
| 668 |
+
{
|
| 669 |
+
$this->_helper->logReason($this->_helper->getOrdersDisabledReason());
|
| 670 |
+
return $observer;
|
| 671 |
+
}
|
| 672 |
+
|
| 673 |
if (!$this->canSendOrder($order))
|
| 674 |
return $observer;
|
| 675 |
|
app/code/local/EmailDirect/Integration/controllers/Admin/ExportController.php
CHANGED
|
@@ -8,13 +8,22 @@ class EmailDirect_Integration_Admin_ExportController extends Mage_Adminhtml_Cont
|
|
| 8 |
|
| 9 |
public function countAction()
|
| 10 |
{
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
}
|
| 19 |
|
| 20 |
private function setConfigValue($name)
|
| 8 |
|
| 9 |
public function countAction()
|
| 10 |
{
|
| 11 |
+
try
|
| 12 |
+
{
|
| 13 |
+
$from = $this->getRequest()->getParam('from');
|
| 14 |
+
$to = $this->getRequest()->getParam('to');
|
| 15 |
+
$include = $this->getRequest()->getParam('include');
|
| 16 |
+
$store = Mage::app()->getRequest()->getParam('store');
|
| 17 |
+
|
| 18 |
+
$orders = Mage::helper('emaildirect')->getOrderExportCollection($from, $to, $include, $store);
|
| 19 |
+
|
| 20 |
+
echo $orders->getSize();
|
| 21 |
+
}
|
| 22 |
+
catch (Exception $e)
|
| 23 |
+
{
|
| 24 |
+
Mage::logException($e);
|
| 25 |
+
echo "Unknown";
|
| 26 |
+
}
|
| 27 |
}
|
| 28 |
|
| 29 |
private function setConfigValue($name)
|
app/code/local/EmailDirect/Integration/controllers/ExportController.php
CHANGED
|
@@ -18,9 +18,4 @@ class EmailDirect_Integration_ExportController extends Mage_Core_Controller_Fron
|
|
| 18 |
|
| 19 |
$this->_prepareDownloadResponse(Mage::helper('emaildirect')->getExportFileName($file_name,false), file_get_contents($file));
|
| 20 |
}
|
| 21 |
-
|
| 22 |
-
public function testAction()
|
| 23 |
-
{
|
| 24 |
-
echo "TEST";
|
| 25 |
-
}
|
| 26 |
}
|
| 18 |
|
| 19 |
$this->_prepareDownloadResponse(Mage::helper('emaildirect')->getExportFileName($file_name,false), file_get_contents($file));
|
| 20 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 21 |
}
|
app/code/local/EmailDirect/Integration/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<EmailDirect_Integration>
|
| 5 |
-
<version>1.5.
|
| 6 |
</EmailDirect_Integration>
|
| 7 |
</modules>
|
| 8 |
<global>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<EmailDirect_Integration>
|
| 5 |
+
<version>1.5.6</version>
|
| 6 |
</EmailDirect_Integration>
|
| 7 |
</modules>
|
| 8 |
<global>
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/date_range.phtml
CHANGED
|
@@ -8,7 +8,7 @@
|
|
| 8 |
<strong>Orders Found: </strong><span id='orders_found'><?php echo $this->getOrdersCount() ?></span>
|
| 9 |
</div>
|
| 10 |
<script type='text/javascript'>
|
| 11 |
-
|
| 12 |
var start_from = '<?php echo $this->getFromDate() ?>';
|
| 13 |
var start_to = '<?php echo $this->getFromDate() ?>';
|
| 14 |
|
|
@@ -117,7 +117,7 @@ function dateRangeChange()
|
|
| 117 |
$('orders_found').update("???");
|
| 118 |
|
| 119 |
new Ajax.Request(url + (url.match(new RegExp('\\?')) ? '&isAjax=true' : '?isAjax=true' ), {
|
| 120 |
-
parameters : {from: from, to: to, include: include},
|
| 121 |
method : 'post',
|
| 122 |
loaderArea : false,
|
| 123 |
onSuccess : function(transport)
|
| 8 |
<strong>Orders Found: </strong><span id='orders_found'><?php echo $this->getOrdersCount() ?></span>
|
| 9 |
</div>
|
| 10 |
<script type='text/javascript'>
|
| 11 |
+
var store = <?php echo Mage::helper('emaildirect')->getAdminStore(); ?>;
|
| 12 |
var start_from = '<?php echo $this->getFromDate() ?>';
|
| 13 |
var start_to = '<?php echo $this->getFromDate() ?>';
|
| 14 |
|
| 117 |
$('orders_found').update("???");
|
| 118 |
|
| 119 |
new Ajax.Request(url + (url.match(new RegExp('\\?')) ? '&isAjax=true' : '?isAjax=true' ), {
|
| 120 |
+
parameters : {from: from, to: to, include: include, store: store},
|
| 121 |
method : 'post',
|
| 122 |
loaderArea : false,
|
| 123 |
onSuccess : function(transport)
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/export/orders.phtml
CHANGED
|
@@ -6,10 +6,11 @@ function perform_order_export()
|
|
| 6 |
var form = $('config_edit_form');
|
| 7 |
var from = form['order_export_from'];
|
| 8 |
var to = form['order_export_to'];
|
|
|
|
| 9 |
var include = form['groups[export][fields][include_already_sent][value]'];
|
| 10 |
var url = '<?php echo $this->getUrl("emaildirect/admin_export/orders/"); ?>';
|
| 11 |
|
| 12 |
-
url += 'export_from/' + $(from).getValue() + '/export_to/' + $(to).getValue() + '/include_already_sent/' + $(include).getValue() + '/';
|
| 13 |
|
| 14 |
window.open(url);
|
| 15 |
}
|
| 6 |
var form = $('config_edit_form');
|
| 7 |
var from = form['order_export_from'];
|
| 8 |
var to = form['order_export_to'];
|
| 9 |
+
var store = <?php echo Mage::helper('emaildirect')->getAdminStore(); ?>;
|
| 10 |
var include = form['groups[export][fields][include_already_sent][value]'];
|
| 11 |
var url = '<?php echo $this->getUrl("emaildirect/admin_export/orders/"); ?>';
|
| 12 |
|
| 13 |
+
url += 'export_from/' + $(from).getValue() + '/export_to/' + $(to).getValue() + '/include_already_sent/' + $(include).getValue() + '/store/' + store + '/';
|
| 14 |
|
| 15 |
window.open(url);
|
| 16 |
}
|
app/design/adminhtml/default/default/template/emaildirect/system/config/form/field/trouble.phtml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<?php
|
| 3 |
$element = $this->getElement();
|
| 4 |
|
| 5 |
-
$enabled = $element->getValue() ==
|
| 6 |
?>
|
| 7 |
<div id="<?php echo $this->getElement()->getHtmlId(); ?>" style='display:none'></div>
|
| 8 |
<span class='trouble_status'>Status: <strong><?php if ($enabled) echo "Enabled"; else echo "Disabled" ?></strong></span>
|
|
@@ -72,7 +72,7 @@ function toggle_trouble()
|
|
| 72 |
function view_details()
|
| 73 |
{
|
| 74 |
var form = $('config_edit_form');
|
| 75 |
-
var url = '<?php echo
|
| 76 |
|
| 77 |
window.location = url;
|
| 78 |
}
|
| 2 |
<?php
|
| 3 |
$element = $this->getElement();
|
| 4 |
|
| 5 |
+
$enabled = $element->getValue() == 1;
|
| 6 |
?>
|
| 7 |
<div id="<?php echo $this->getElement()->getHtmlId(); ?>" style='display:none'></div>
|
| 8 |
<span class='trouble_status'>Status: <strong><?php if ($enabled) echo "Enabled"; else echo "Disabled" ?></strong></span>
|
| 72 |
function view_details()
|
| 73 |
{
|
| 74 |
var form = $('config_edit_form');
|
| 75 |
+
var url = '<?php echo Mage::helper('emaildirect')->getAdminUrl("emaildirect/admin_troubleshooting/"); ?>';
|
| 76 |
|
| 77 |
window.location = url;
|
| 78 |
}
|
app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export.phtml
CHANGED
|
@@ -16,7 +16,6 @@
|
|
| 16 |
<li style="background-color:#FFD;">
|
| 17 |
<img src="<?php echo $this->getSkinUrl('images/fam_bullet_error.gif');?>" class="v-middle" style="margin-right:5px"/>
|
| 18 |
<?php echo $this->__("Warning: Please do not close the window during export process!");?>
|
| 19 |
-
|
| 20 |
</li>
|
| 21 |
</ul>
|
| 22 |
<ul id="profileRows">
|
|
@@ -41,11 +40,12 @@
|
|
| 41 |
var config = <?php echo $this->getBatchConfigJson();?>;
|
| 42 |
var group = <?php echo $this->getBatchSize() ?>;
|
| 43 |
var upload_ed = <?php echo $this->getUploadStatus() ?>;
|
|
|
|
| 44 |
</script>
|
| 45 |
<script type="text/javascript">
|
| 46 |
|
| 47 |
function execImportData()
|
| 48 |
-
{
|
| 49 |
if (importData.length == 0)
|
| 50 |
{
|
| 51 |
// Finished
|
|
@@ -63,7 +63,7 @@ function execImportData()
|
|
| 63 |
Element.insert($("liFinished"), {before: config.tpl.evaluate({
|
| 64 |
style: "background-color:"+config.styles.message.bg,
|
| 65 |
image: config.styles.message.icon,
|
| 66 |
-
text: config.tplUploading.evaluate(),
|
| 67 |
id: "uploadingFinish"
|
| 68 |
})});
|
| 69 |
}
|
|
@@ -74,9 +74,10 @@ function execImportData()
|
|
| 74 |
$("liBeforeFinish").show();
|
| 75 |
}
|
| 76 |
|
| 77 |
-
new Ajax.Request("<?php echo $this->getUrl('*/*/batchFinish');?>",
|
|
|
|
| 78 |
method: "post",
|
| 79 |
-
parameters: {filename: filename, form_key: FORM_KEY, export_type: export_type},
|
| 80 |
onComplete: function(transport)
|
| 81 |
{
|
| 82 |
if (transport.responseText.isJSON())
|
|
@@ -155,33 +156,34 @@ function sendImportData(id,id_name)
|
|
| 155 |
|
| 156 |
if (!data.form_key)
|
| 157 |
data.form_key = FORM_KEY;
|
| 158 |
-
|
| 159 |
data.export_type = export_type;
|
| 160 |
-
|
| 161 |
data.filename = filename;
|
| 162 |
|
| 163 |
-
new Ajax.Request("<?php echo $this->getUrl("*/*/batchRun/");?>",
|
| 164 |
-
|
| 165 |
-
|
| 166 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 167 |
{
|
| 168 |
-
|
| 169 |
-
|
| 170 |
-
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
image: config.styles.error.icon,
|
| 177 |
-
text: transport.responseText.escapeHTML(),
|
| 178 |
-
id: "error-" + countOfStartedProfiles
|
| 179 |
-
})
|
| 180 |
-
});
|
| 181 |
-
countOfError ++;
|
| 182 |
-
}
|
| 183 |
-
execImportData();
|
| 184 |
}
|
|
|
|
|
|
|
| 185 |
});
|
| 186 |
}
|
| 187 |
|
| 16 |
<li style="background-color:#FFD;">
|
| 17 |
<img src="<?php echo $this->getSkinUrl('images/fam_bullet_error.gif');?>" class="v-middle" style="margin-right:5px"/>
|
| 18 |
<?php echo $this->__("Warning: Please do not close the window during export process!");?>
|
|
|
|
| 19 |
</li>
|
| 20 |
</ul>
|
| 21 |
<ul id="profileRows">
|
| 40 |
var config = <?php echo $this->getBatchConfigJson();?>;
|
| 41 |
var group = <?php echo $this->getBatchSize() ?>;
|
| 42 |
var upload_ed = <?php echo $this->getUploadStatus() ?>;
|
| 43 |
+
var store = <?php echo $this->getStore() ?>;
|
| 44 |
</script>
|
| 45 |
<script type="text/javascript">
|
| 46 |
|
| 47 |
function execImportData()
|
| 48 |
+
{
|
| 49 |
if (importData.length == 0)
|
| 50 |
{
|
| 51 |
// Finished
|
| 63 |
Element.insert($("liFinished"), {before: config.tpl.evaluate({
|
| 64 |
style: "background-color:"+config.styles.message.bg,
|
| 65 |
image: config.styles.message.icon,
|
| 66 |
+
text: config.tplUploading.evaluate({updated:countOfUpdated}),
|
| 67 |
id: "uploadingFinish"
|
| 68 |
})});
|
| 69 |
}
|
| 74 |
$("liBeforeFinish").show();
|
| 75 |
}
|
| 76 |
|
| 77 |
+
new Ajax.Request("<?php echo $this->getUrl('*/*/batchFinish');?>",
|
| 78 |
+
{
|
| 79 |
method: "post",
|
| 80 |
+
parameters: {filename: filename, form_key: FORM_KEY, export_type: export_type, store: store},
|
| 81 |
onComplete: function(transport)
|
| 82 |
{
|
| 83 |
if (transport.responseText.isJSON())
|
| 156 |
|
| 157 |
if (!data.form_key)
|
| 158 |
data.form_key = FORM_KEY;
|
| 159 |
+
|
| 160 |
data.export_type = export_type;
|
| 161 |
+
|
| 162 |
data.filename = filename;
|
| 163 |
|
| 164 |
+
new Ajax.Request("<?php echo $this->getUrl("*/*/batchRun/");?>",
|
| 165 |
+
{
|
| 166 |
+
method: "post",
|
| 167 |
+
parameters: data,
|
| 168 |
+
onSuccess: function(transport)
|
| 169 |
+
{
|
| 170 |
+
countOfStartedProfiles --;
|
| 171 |
+
countOfUpdated += updated;
|
| 172 |
+
if (transport.responseText.isJSON())
|
| 173 |
+
addProfileRow(transport.responseText.evalJSON());
|
| 174 |
+
else
|
| 175 |
{
|
| 176 |
+
Element.insert($("updatedRows"), {before: config.tpl.evaluate({
|
| 177 |
+
style: "background-color: "+config.styles.error.bg,
|
| 178 |
+
image: config.styles.error.icon,
|
| 179 |
+
text: transport.responseText.escapeHTML(),
|
| 180 |
+
id: "error-" + countOfStartedProfiles
|
| 181 |
+
})
|
| 182 |
+
});
|
| 183 |
+
countOfError ++;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 184 |
}
|
| 185 |
+
execImportData();
|
| 186 |
+
}
|
| 187 |
});
|
| 188 |
}
|
| 189 |
|
app/design/adminhtml/default/default/template/emaildirect/system/convert/profile/export_orders.phtml
DELETED
|
File without changes
|
package.xml
CHANGED
|
@@ -1,22 +1,19 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>EmailDirect_Integration</name>
|
| 4 |
-
<version>1.5.
|
| 5 |
<stability>stable</stability>
|
| 6 |
-
<license
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>EmailDirect integration for magento</summary>
|
| 10 |
<description>EmailDirect integration for magento</description>
|
| 11 |
<notes>Bug fixes for multiple store configuration.
|
| 12 |
-
|
| 13 |
-
Override option for Sources on existing records
|
| 14 |
-
Debug/Troubleshooting improvements
|
| 15 |
-
Misc fixes</notes>
|
| 16 |
<authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
|
| 17 |
-
<date>2013-
|
| 18 |
-
<time>
|
| 19 |
-
<contents><target name="magelocal"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><file name="Grid.php" hash="6c89297aecebd7d25c1178bdd3fd5529"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="7649b64cf2319484207c5179df7b4e9f"/></dir><dir name="Form"><dir name="Field"><dir name="Export"><file name="Orders.php" hash="ddcfc1c3c579421bc5c8af9173d1cbf2"/><file name="Products.php" hash="0c6a9936ccc806b9e3ddf573d1df1e53"/><file name="Range.php" hash="
|
| 20 |
<compatible/>
|
| 21 |
<dependencies/>
|
| 22 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>EmailDirect_Integration</name>
|
| 4 |
+
<version>1.5.6</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
+
<license/>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>EmailDirect integration for magento</summary>
|
| 10 |
<description>EmailDirect integration for magento</description>
|
| 11 |
<notes>Bug fixes for multiple store configuration.
|
| 12 |
+
Export fixes for older Enterprise versions.</notes>
|
|
|
|
|
|
|
|
|
|
| 13 |
<authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
|
| 14 |
+
<date>2013-10-16</date>
|
| 15 |
+
<time>15:39:02</time>
|
| 16 |
+
<contents><target name="magelocal"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><file name="Grid.php" hash="6c89297aecebd7d25c1178bdd3fd5529"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="7649b64cf2319484207c5179df7b4e9f"/></dir><dir name="Form"><dir name="Field"><dir name="Export"><file name="Orders.php" hash="ddcfc1c3c579421bc5c8af9173d1cbf2"/><file name="Products.php" hash="0c6a9936ccc806b9e3ddf573d1df1e53"/><file name="Range.php" hash="b29f2227412e1f4fe9ba4c2e6e3b615d"/></dir><file name="Addressmapfields.php" hash="97b75c8340d561e863a3985ad73ce228"/><file name="Common.php" hash="e597ff375c4b46b92d6aa35646e3d8c9"/><file name="Mapfields.php" hash="677ebfd526fba11a1c177c00ae085526"/><file name="Note.php" hash="ef99a474bbc3a828c7a618132a80fe66"/><file name="Shippingmapfields.php" hash="589a74260f394a5eae1b57ca89a74a8b"/><file name="Troubleshooting.php" hash="47a95d34e8d091d8b1b46113172515cf"/></dir></dir><file name="Account.php" hash="60fa8e43a87e1f2ff71c319c979556b2"/></dir><dir name="Convert"><dir name="Profile"><dir name="Export"><file name="Orders.php" hash="eb9be61e0accdfaf3a2f315eb5eaae5b"/><file name="Products.php" hash="a58d1d192ef82fd6ce032db7455b11b8"/></dir><file name="Export.php" hash="0ac2fa1fefcd4c4a238417175350ad6c"/></dir></dir></dir><dir name="Troubleshooting"><dir name="View"><dir name="Tab"><file name="Download.php" hash="9315a364a46f9e39972bbd0a47152e90"/><file name="Info.php" hash="6714b756a3fa7a5812356e544fe48f1b"/><file name="Log.php" hash="7c3661722d1197cd8a564f76275353c7"/><file name="Submit.php" hash="8831d886858fde08a4323eea66ec76d2"/></dir><file name="Form.php" hash="e527a3a2335b109c48a69f06c1b0d01f"/></dir><file name="Tabs.php" hash="ab1fdbe561e8572c2c50cdbec9573f82"/><file name="View.php" hash="b85696126e6874b0f5a19d0af6183add"/></dir><file name="Abandoned.php" hash="c8b14b123f121b528b9a9d3b6c90c328"/></dir><dir name="Checkout"><file name="Subscribe.php" hash="ae325e815a54bde93507562cf0d86b8a"/></dir><dir name="Customer"><dir name="Account"><dir name="Dashboard"><file name="Info.php" hash="20e74d9c2b2c02611c8f69b254d81ef5"/></dir><file name="Lists.php" hash="3c3bdb9482ecf4a71740a80395bd5465"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="AbandonedMinutes.php" hash="22e33be85dc8348fce9b49637ead919d"/><file name="Action.php" hash="b85ef0454ab5c65ef0c43c7ef057ecc2"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="f9b2c6b6c1adc18fbc86da7349f66d87"/><file name="Fields.php" hash="1275a766d979e1ac3efabbf168ac92f5"/></dir><dir name="Model"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Export"><file name="Batch.php" hash="96c51fc5c0b947750be4e612e32c83ab"/></dir><file name="Abandoned.php" hash="9881811b94f38be90bd20a99951a1903"/><file name="Abandonedlist.php" hash="a5d3b987ea2a2d8672c9c2c3473c24e2"/><file name="Additionallist.php" hash="1fcede7a1efe84ce13104194f3dc9962"/><file name="Checkoutsubscribe.php" hash="fd90252a1f19649a420dae136ad2a2ba"/><file name="List.php" hash="00611b9215b54e86171a8e4a9a5e54db"/><file name="Publication.php" hash="903657f0b2a911af97f8bccb6d9cffab"/><file name="Source.php" hash="4b641d4757221c88d26458ae62bc874a"/><file name="States.php" hash="82682b97d671eb616649dfc52e202100"/><file name="Time.php" hash="0e26839880e25ec0eedce1ce8a663c0f"/></dir></dir></dir><dir name="Wrapper"><file name="Abandoned.php" hash="ef81d36a7276737f2d0aa1a5d783a83b"/><file name="Abstract.php" hash="9e97ce6a12e0d074921bb3a1391f3648"/><file name="Database.php" hash="3cceb467358d13584baff58c043762ec"/><file name="Execute.php" hash="7ffbdec336a7ddf6ec9dae21fd3b8545"/><file name="Ftp.php" hash="d5335cfb68f99761d6902dd390a3d7a8"/><file name="Lists.php" hash="dff74c445f6a9582b35bb24560582c2b"/><file name="Orders.php" hash="81dbf1045688e932fa6175784c2bf0cb"/><file name="Publications.php" hash="815715549df345ccb5b69ed65589aa53"/><file name="Sources.php" hash="c6caf0274f7d0c50114324bc47a490c4"/><file name="Subscribers.php" hash="064e07d8f2015cf56f7e82844f5df54c"/></dir><file name="Observer.php" hash="757e853b34ede51a2877cbdedb9d6334"/></dir><dir name="controllers"><dir name="Admin"><file name="AbandonedController.php" hash="a662c919ac3fae1503616a1795c96cf9"/><file name="ExportController.php" hash="f9ceaa6b2fd25c5c283b01dbf182c27e"/><file name="OrderExportController.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="TroubleshootingController.php" hash="c3dbc4bd72620dcd0b5844c3ee735f4e"/></dir><dir name="Customer"><file name="AccountController.php" hash="16bfdb6de4804a5d71cb972afbff4537"/></dir><file name="AbandonedController.php" hash="138accdf0fb53ae11ca1c10f522845f2"/><file name="ExportController.php" hash="7ca147debc5c1436b3bf2d9501592f33"/></dir><dir name="etc"><file name="adminhtml.xml" hash="896c10d8a3f932346e7d301052b1b6a6"/><file name="config.xml" hash="2dd5f55b464a0a8bf8ca1d8e2d8a0dc9"/><file name="system.xml" hash="c3cf6a78186905e69f73765a19f900fb"/></dir><dir name="sql"><dir name="emaildirect_setup"><file name="mysql4-install-1.0.0.php" hash="9dc51edb346e9676735e15d3e78fa3eb"/><file name="mysql4-upgrade-1.0.13-1.0.14.php" hash="c42e2677b3960a049d7137b622552084"/><file name="mysql4-upgrade-1.0.19-1.2.0.php" hash="742be042b7f56e7ff2002b0606270ca6"/><file name="mysql4-upgrade-1.5.4-1.5.5.php" hash="560244d63a037f88201a61d7f7482d2c"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="emaildirect"><file name="emaildirect-connected-ebizmarts-title.png" hash="faf3858f23eafe3a89cce144fef6bd2a"/><file name="emaildirect-section-background.png" hash="c205ce454fe63280d7d7dd74428b7ea4"/><file name="emaildirect-tab.png" hash="9ddb077b74a7078ac509d79b024631a1"/><file name="emaildirect.css" hash="3b6aab355cd3c061d7af59ec24871dce"/><file name="emaildirect.js" hash="ce03dd6f51ea529fc4acdc5116f4e030"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="emaildirect"><dir name="images"><file name="bkg_block-title.gif" hash="f8c1f130ad69464fe7aff2f589b2ec75"/><file name="dotted_divider.gif" hash="260ebae91ffb1b7c663906b29a069925"/><file name="emaildirect-tile.png" hash="86a0ed36169ab9691480fc995ab674a8"/><file name="i_block-subscribe.gif" hash="9e5fee06a543742045118a95f2debcb8"/></dir><file name="integration.js" hash="d8c8d5bf0ddb4f6ead23bec8a2814475"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="emaildirect.xml" hash="60db91d36cf7929e5999239fcd4df256"/></dir><dir name="template"><dir name="emaildirect"><dir name="abandoned"><file name="grid.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="4d7607ecb15d13cfe8bb0cc889cb724f"/></dir><dir name="form"><dir name="field"><dir name="export"><file name="date_range.phtml" hash="0061fbfbfdba23ce3c4d98e66184c3a2"/><file name="orders.phtml" hash="e8006492a9048c117f2a0a95ed3bf717"/><file name="products.phtml" hash="99b88859146f490f87690cd44cabc999"/></dir><file name="array.phtml" hash="5415eeff311735624354468c886d39b5"/><file name="note.phtml" hash="6625a3771ba10daba5ded5570574716f"/><file name="trouble.phtml" hash="824ff5238a169b1a9ef288118b4bf96d"/></dir></dir></dir><dir name="convert"><dir name="profile"><file name="export.phtml" hash="9be5cdbc2e46b9fa65950b5d6558dca5"/></dir></dir></dir><dir name="troubleshooting"><dir name="view"><dir name="tab"><file name="download.phtml" hash="78ec34fd9c3c8b660b19f9e799d8e76e"/><file name="info.phtml" hash="bd19bb1072ce1d60a4fb7bda660a0ce7"/><file name="log.phtml" hash="c9e2c9493a2dad579bba4ed53795cf5e"/><file name="submit.phtml" hash="c2269f4a6a52d66bff5eac660d0831bd"/></dir><file name="form.phtml" hash="d2338bfe3598e9315ca8f5ac8d9b5516"/></dir><file name="view.phtml" hash="ee6af3fe79d916af764f41e7e8c5cc37"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="emaildirect.xml" hash="9803fe9024b7eb6415713d81fe27c629"/></dir><dir name="template"><dir name="emaildirect"><dir name="checkout"><file name="subscribe.phtml" hash="351ea790305f0a3ec99c34180bbee235"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="info.phtml" hash="4256a03d67ec2a6f97867a87564cff92"/></dir><file name="lists.phtml" hash="4c697dcfa63ece1db7885cadb02982d1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="order"><file name="default.phtml" hash="2d65f3d02b9baa08969d68f2a2cca348"/></dir></dir><file name="items.phtml" hash="e6b15e6460010c5acae66017d177bfb9"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><file name="newsletter_subscr_success_emaildirect.html" hash="f6afb69d207bbc3f8920e7a72ac9dd07"/><file name="newsletter_unsub_success_emaildirect.html" hash="bd9f97e8f5485180d4420097b5200ef4"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="EmailDirect_Integration.xml" hash="2d2666e6d9cd8d40a4974d5e242721d6"/></dir></target></contents>
|
| 17 |
<compatible/>
|
| 18 |
<dependencies/>
|
| 19 |
</package>
|
