EmailDirect_Integration - Version 2.0.4

Version Notes

Update to ensure Force Subscription option succeeds when enabled.

Download this release

Release Info

Developer Magento Core Team
Extension EmailDirect_Integration
Version 2.0.4
Comparing to
See all releases


Code changes from version 2.0.3 to 2.0.4

Files changed (8) hide show
  1. app/code/community/EmailDirect/Integration/Helper/Data.php +11 -0
  2. app/code/community/EmailDirect/Integration/Model/Observer.php +16 -17
  3. app/code/community/EmailDirect/Integration/Model/Resource/Setup.php +40 -0
  4. app/code/community/EmailDirect/Integration/Model/Wrapper/Orders.php +4 -2
  5. app/code/community/EmailDirect/Integration/etc/config.xml +2 -1
  6. app/code/community/EmailDirect/Integration/sql/emaildirect_setup/mysql4-install-2.0.0.php +8 -0
  7. app/code/community/EmailDirect/Integration/sql/emaildirect_setup/mysql4-upgrade-1.5.8-2.0.0.php +1 -1
  8. package.xml +5 -9
app/code/community/EmailDirect/Integration/Helper/Data.php CHANGED
@@ -91,6 +91,17 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
91
  return array();
92
  }
93
 
 
 
 
 
 
 
 
 
 
 
 
94
  public function getOrderExportCollection($from, $to, $include, $store = null)
95
  {
96
  $from_date = Mage::getModel('core/date')->gmtDate(null,strtotime($from)); // 2010-05-11 15:00:00
91
  return array();
92
  }
93
 
94
+ public function forceSubscribe()
95
+ {
96
+ $option = (int)$this->config('checkout_subscribe');
97
+
98
+ // Force subscribe on
99
+ if ($option == 3)
100
+ return true;
101
+
102
+ return false;
103
+ }
104
+
105
  public function getOrderExportCollection($from, $to, $include, $store = null)
106
  {
107
  $from_date = Mage::getModel('core/date')->gmtDate(null,strtotime($from)); // 2010-05-11 15:00:00
app/code/community/EmailDirect/Integration/Model/Observer.php CHANGED
@@ -688,18 +688,28 @@ class EmailDirect_Integration_Model_Observer
688
  {
689
  try
690
  {
691
- $starting_store = Mage::app()->getStore()->getCode();
692
-
693
  $this->_helper->setLogArea(EmailDirect_Integration_Helper_Data::CUSTOMER);
 
 
 
694
 
695
  $customer = $observer->getEvent()->getCustomer();
696
 
 
 
 
 
 
 
697
  $customer_store = $customer->getStore()->getId();
698
 
699
  $current_store = Mage::app()->getStore()->getId();
700
 
 
 
701
  if ($current_store == 0)
702
  {
 
703
  if ($customer_store == 0)
704
  {
705
  $this->_helper->logReason("Customer store can't be determined");
@@ -709,7 +719,7 @@ class EmailDirect_Integration_Model_Observer
709
  Mage::app()->setCurrentStore($customer_store);
710
  }
711
 
712
- $this->_helper->log("Update Customer Start");
713
 
714
  if (!$this->_helper->canEdirect())
715
  {
@@ -765,31 +775,20 @@ class EmailDirect_Integration_Model_Observer
765
  return $observer;
766
  }
767
 
768
- private function forceSubscribe()
769
- {
770
- $option = (int)$this->_helper->config('checkout_subscribe');
771
-
772
- // Force subscribe on
773
- if ($option == 3)
774
- return true;
775
-
776
- return false;
777
- }
778
-
779
  public function registerCheckoutSubscribe(Varien_Event_Observer $observer)
780
  {
781
  try
782
  {
783
  $this->_helper->setLogArea(EmailDirect_Integration_Helper_Data::NEWSLETTER);
784
  $this->_helper->log("Register Checkout Subscribe Start");
785
- if(!$this->_helper->canEdirect())
786
  {
787
  $this->_helper->logReason($this->_helper->getDisabledReason());
788
  return;
789
  }
790
  $subscribe = Mage::app()->getRequest()->getPost('emaildirect_subscribe');
791
 
792
- if(!is_null($subscribe) || $this->forceSubscribe())
793
  Mage::getSingleton('core/session')->setEmaildirectCheckout($subscribe);
794
 
795
  $this->_helper->log("Register Checkout Subscribe End");
@@ -818,7 +817,7 @@ class EmailDirect_Integration_Model_Observer
818
  }
819
 
820
  $sessionFlag = Mage::getSingleton('core/session')->getEmaildirectCheckout(TRUE);
821
- if (!$sessionFlag)
822
  {
823
  $this->_helper->logReason("Session flag not found.");
824
  return;
688
  {
689
  try
690
  {
 
 
691
  $this->_helper->setLogArea(EmailDirect_Integration_Helper_Data::CUSTOMER);
692
+ $this->_helper->log("Update Customer Start");
693
+
694
+ $starting_store = Mage::app()->getStore()->getCode();
695
 
696
  $customer = $observer->getEvent()->getCustomer();
697
 
698
+ if (!$customer)
699
+ {
700
+ $this->_helper->logReason("Customer not found");
701
+ return $observer;
702
+ }
703
+
704
  $customer_store = $customer->getStore()->getId();
705
 
706
  $current_store = Mage::app()->getStore()->getId();
707
 
708
+ $this->_helper->log("Checking store");
709
+
710
  if ($current_store == 0)
711
  {
712
+ $this->_helper->log("Admin store current");
713
  if ($customer_store == 0)
714
  {
715
  $this->_helper->logReason("Customer store can't be determined");
719
  Mage::app()->setCurrentStore($customer_store);
720
  }
721
 
722
+ $this->_helper->log("Correct store found");
723
 
724
  if (!$this->_helper->canEdirect())
725
  {
775
  return $observer;
776
  }
777
 
 
 
 
 
 
 
 
 
 
 
 
778
  public function registerCheckoutSubscribe(Varien_Event_Observer $observer)
779
  {
780
  try
781
  {
782
  $this->_helper->setLogArea(EmailDirect_Integration_Helper_Data::NEWSLETTER);
783
  $this->_helper->log("Register Checkout Subscribe Start");
784
+ if (!$this->_helper->canEdirect())
785
  {
786
  $this->_helper->logReason($this->_helper->getDisabledReason());
787
  return;
788
  }
789
  $subscribe = Mage::app()->getRequest()->getPost('emaildirect_subscribe');
790
 
791
+ if (!is_null($subscribe) || $this->_helper->forceSubscribe())
792
  Mage::getSingleton('core/session')->setEmaildirectCheckout($subscribe);
793
 
794
  $this->_helper->log("Register Checkout Subscribe End");
817
  }
818
 
819
  $sessionFlag = Mage::getSingleton('core/session')->getEmaildirectCheckout(TRUE);
820
+ if (!$sessionFlag && !$this->_helper->forceSubscribe())
821
  {
822
  $this->_helper->logReason("Session flag not found.");
823
  return;
app/code/community/EmailDirect/Integration/Model/Resource/Setup.php ADDED
@@ -0,0 +1,40 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class EmailDirect_Integration_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup
4
+ {
5
+
6
+ public function addNotification($title, $description, $url = "", $severity = Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE)
7
+ {
8
+ Mage::getSingleton('adminnotification/inbox')->add(
9
+ $severity,
10
+ $title,
11
+ $description,
12
+ $url
13
+ );
14
+ }
15
+
16
+ public function renameOld()
17
+ {
18
+ try
19
+ {
20
+ $local = Mage::getBaseDir('code') . DS . "local" . DS;
21
+
22
+ $old = "{$local}EmailDirect";
23
+ $new = "{$local}EmailDirect_Old";
24
+
25
+ if (is_dir($old))
26
+ {
27
+ rename($old,$new);
28
+
29
+ $this->addNotification(
30
+ "The EmailDirect extension was updated. The older version has been moved.",
31
+ "The EmailDirect extension is now located in the Community folder. The version in the Local folder has been moved to {$new} so that it does not interfere with the new code."
32
+ );
33
+ }
34
+ }
35
+ catch (Exception $e)
36
+ {
37
+ Mage::helper('emaildirect')->logException($e);
38
+ }
39
+ }
40
+ }
app/code/community/EmailDirect/Integration/Model/Wrapper/Orders.php CHANGED
@@ -21,7 +21,7 @@ class EmailDirect_Integration_Model_Wrapper_Orders extends EmailDirect_Integrati
21
  $parent_items = array();
22
  foreach($items as $item)
23
  {
24
- $type = $item->getProductType();
25
  if ($type == "bundle")
26
  $parent_items[$item->getId()] = $item;
27
  }
@@ -65,8 +65,10 @@ class EmailDirect_Integration_Model_Wrapper_Orders extends EmailDirect_Integrati
65
  {
66
  $order_data = "<Orders>" . $this->getOrderXml($order) . "</Orders>";
67
 
 
 
68
  // Same call just different adding the order info
69
- return Mage::getSingleton('emaildirect/wrapper_subscribers')->subscriberAdd($email, $merge_vars, $order_data, false);
70
  }
71
 
72
  public function addSubscriberTracking($email,$merge_vars)
21
  $parent_items = array();
22
  foreach($items as $item)
23
  {
24
+ $type = $item->getProductType();
25
  if ($type == "bundle")
26
  $parent_items[$item->getId()] = $item;
27
  }
65
  {
66
  $order_data = "<Orders>" . $this->getOrderXml($order) . "</Orders>";
67
 
68
+ $subscribe = Mage::helper('emaildirect')->forceSubscribe();
69
+
70
  // Same call just different adding the order info
71
+ return Mage::getSingleton('emaildirect/wrapper_subscribers')->subscriberAdd($email, $merge_vars, $order_data, $subscribe);
72
  }
73
 
74
  public function addSubscriberTracking($email,$merge_vars)
app/code/community/EmailDirect/Integration/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <EmailDirect_Integration>
5
- <version>2.0.3</version>
6
  </EmailDirect_Integration>
7
  </modules>
8
  <global>
@@ -64,6 +64,7 @@
64
  <emaildirect_setup>
65
  <setup>
66
  <module>EmailDirect_Integration</module>
 
67
  </setup>
68
  <connection>
69
  <use>core_setup</use>
2
  <config>
3
  <modules>
4
  <EmailDirect_Integration>
5
+ <version>2.0.4</version>
6
  </EmailDirect_Integration>
7
  </modules>
8
  <global>
64
  <emaildirect_setup>
65
  <setup>
66
  <module>EmailDirect_Integration</module>
67
+ <class>EmailDirect_Integration_Model_Resource_Setup</class>
68
  </setup>
69
  <connection>
70
  <use>core_setup</use>
app/code/community/EmailDirect/Integration/sql/emaildirect_setup/mysql4-install-2.0.0.php CHANGED
@@ -38,6 +38,14 @@ CREATE TABLE {$this->getTable('emaildirect/order')} (
38
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
39
 
40
  ");
 
 
 
 
 
 
 
 
41
  }
42
  catch (Exception $e)
43
  {
38
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
39
 
40
  ");
41
+
42
+ // Add install message to inbox
43
+
44
+ $this->addNotification(
45
+ 'The EmailDirect extension was installed. Enter your API Key to configure the settings and make sure your cron jobs are running.',
46
+ 'The EmailDirect extension was installed. Enter your API Key to configure the settings and make sure your cron jobs are running. Cron Install and Setup Guide (http://emaildirect.com/Magento)',
47
+ 'http://emaildirect.com/Magento'
48
+ );
49
  }
50
  catch (Exception $e)
51
  {
app/code/community/EmailDirect/Integration/sql/emaildirect_setup/mysql4-upgrade-1.5.8-2.0.0.php CHANGED
@@ -40,7 +40,7 @@ CREATE TABLE {$this->getTable('emaildirect/order')} (
40
  ");
41
 
42
  // Rename the old local installation so that it doesn't interfere with the new community code
43
- Mage::helper('emaildirect/upgrade')->renameOld();
44
  }
45
  catch (Exception $e)
46
  {
40
  ");
41
 
42
  // Rename the old local installation so that it doesn't interfere with the new community code
43
+ $this->renameOld();
44
  }
45
  catch (Exception $e)
46
  {
package.xml CHANGED
@@ -1,22 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EmailDirect_Integration</name>
4
- <version>2.0.3</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>Configurable, Grouped and Bundle Product improvements.&#xD;
12
- &#xD;
13
- Related Products Improvements.&#xD;
14
- &#xD;
15
- Updates for custom checkouts.</notes>
16
  <authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
17
- <date>2014-05-23</date>
18
- <time>04:12:59</time>
19
- <contents><target name="magecommunity"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><file name="Grid.php" hash="4a3f8d29d3d8feb13ae124297267ae85"/><file name="Status.php" hash="9a740fd8c63148532bbcf07d19f462df"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="d01c241e1c4a42cd08f087ad784ed78e"/></dir><dir name="Form"><dir name="Field"><dir name="Export"><file name="Orders.php" hash="5b101fadb6a64044b276eb07b21cf0a5"/><file name="Products.php" hash="32e13d4b7250890bf84aba87f25de03c"/><file name="Range.php" hash="4adac96fa53fa8e1449bae943a8cca80"/></dir><dir name="Signup"><file name="Test.php" hash="3b773dda25c62bc8cb28031931d67f9f"/></dir><file name="Addressmapfields.php" hash="97b75c8340d561e863a3985ad73ce228"/><file name="Common.php" hash="6a86cce53f6df6857ea79241fa281939"/><file name="Info.php" hash="246de52ea5d2349ecd7f103cbba8cb8f"/><file name="Mapfields.php" hash="16894c5d76df1293e63128e349700e05"/><file name="Note.php" hash="ef99a474bbc3a828c7a618132a80fe66"/><file name="Shippingmapfields.php" hash="589a74260f394a5eae1b57ca89a74a8b"/><file name="Troubleshooting.php" hash="ff6b463004ab037031acea4a6f1d8517"/></dir></dir></dir><dir name="Convert"><dir name="Profile"><dir name="Export"><file name="Orders.php" hash="947af2b0d8e3f7bc47c47b32cd434f18"/><file name="Products.php" hash="3f93e4789dbeb6710cd2742587d61726"/></dir><file name="Export.php" hash="ba879607ac0693e9db6251bbbc1676a1"/></dir></dir></dir><dir name="Troubleshooting"><dir name="View"><dir name="Tab"><file name="Download.php" hash="619916677df7c833e559aae74dae2aa0"/><file name="Info.php" hash="4dad4b18e215d6df8c8e6631b4323b53"/><file name="Log.php" hash="d3dcb67ca284358eaa70db517637da87"/><file name="Submit.php" hash="fe896683680ab10ada6b67e0e803ccce"/></dir><file name="Form.php" hash="e527a3a2335b109c48a69f06c1b0d01f"/></dir><file name="Tabs.php" hash="ab1fdbe561e8572c2c50cdbec9573f82"/><file name="View.php" hash="b2d83536aade45e41039875db85b3018"/></dir><file name="Abandoned.php" hash="515b0c172e093341a2e69cb75570e553"/></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"><dir name="Abandoned"><file name="Minutes.php" hash="e311f6de480fd4b63aee7f46ea412372"/></dir><file name="Action.php" hash="bf2243f50c9c6dafca26a5bcb889f372"/></dir></dir></dir></dir><file name="Capture.php" hash="b005beb856451f49178f2a6914fd5ae7"/><file name="Signup.php" hash="511c9376560cdc5f63b7dc00bdc205be"/></dir><dir name="Helper"><file name="Data.php" hash="e4c28346fa3ecbb373522c72a1c04d0b"/><file name="Fields.php" hash="a071611d146c1cbe453c9955c9251da0"/><file name="Upgrade.php" hash="407f12bce2c7c06c73a23d8ed853a038"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Abandoned"><file name="Collection.php" hash="5a64b4e8b672f80b4d9b6cc5a0d231eb"/></dir><dir name="Order"><file name="Collection.php" hash="43d343562cf7e54f1b36315aa5d1d4a7"/></dir><dir name="Session"><file name="Collection.php" hash="7d6a8283fdbc1207d709e2bbbc78906d"/></dir><file name="Abandoned.php" hash="485b3771906783d383de75ae9761e55c"/><file name="Order.php" hash="8d538a5737095a1ba0ad448c027b3afb"/><file name="Session.php" hash="516eeeb28038416dc885ed7af6a8a8b0"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Export"><file name="Batch.php" hash="96c51fc5c0b947750be4e612e32c83ab"/></dir><dir name="Send"><file name="Field.php" hash="8ecffa8ccce40f3b2db6513b24eb9200"/></dir><dir name="Signup"><file name="Opacity.php" hash="8eabed4c72e7347f0376c3d4cc1023a7"/><file name="Recurrence.php" hash="e11200bbc204b00486c373d8a4e6675e"/></dir><file name="Abandoned.php" hash="9881811b94f38be90bd20a99951a1903"/><file name="Abandonedlist.php" hash="66386003113d8589c9f3de4f03f538a8"/><file name="Additionallist.php" hash="254081820d07a8754a71743ea58a7af4"/><file name="Checkoutsubscribe.php" hash="fd90252a1f19649a420dae136ad2a2ba"/><file name="List.php" hash="d76e36c0198e509a63c663e827cc7940"/><file name="Publication.php" hash="635fae1c20981c0ca7b90007a00e99a7"/><file name="Sequence.php" hash="ec9718c2b5dc35c559e5c09e345eff88"/><file name="Source.php" hash="f3c246959c74f6d378f3e2d7b8148d7f"/><file name="States.php" hash="a746affc786d8165a98801e68cbf80ab"/><file name="Statuses.php" hash="9844a7a9c3b5c68df45c8f6c518acf16"/><file name="Time.php" hash="8acbb5cb33e66de1e408cf55d17a9398"/></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="5a339e0a5407cf05b161102fc65595bb"/><file name="Ftp.php" hash="d5335cfb68f99761d6902dd390a3d7a8"/><file name="Lists.php" hash="425d64b9256bbdbafa899c4138e78368"/><file name="Orders.php" hash="86b67096652aef21711c41e1992f4fbe"/><file name="Publications.php" hash="815715549df345ccb5b69ed65589aa53"/><file name="Sources.php" hash="c6caf0274f7d0c50114324bc47a490c4"/><file name="Subscribers.php" hash="1761d56b33e62b809ba7d380655d1d43"/></dir><file name="Abandoned.php" hash="93bd43b59b143dec15858a6fba6ae568"/><file name="Observer.php" hash="678bc7fed14d0b94a79d7627a4b0b4b7"/><file name="Order.php" hash="b21426543cd46f799cd0743525120fb8"/><file name="Session.php" hash="c56ecf779dbfb2dae0030935af31911a"/></dir><dir name="controllers"><dir name="Admin"><file name="AbandonedController.php" hash="04be2181a65e505084b324188f1fd64d"/><file name="ExportController.php" hash="e4d3eb0b3a9ef9f3caa0146debc256bc"/><file name="TroubleshootingController.php" hash="3de9950849e08648d8872aea4760c992"/></dir><dir name="Customer"><file name="AccountController.php" hash="ae75c37519f8d9f671509ff9b7fb34a4"/></dir><file name="AbandonedController.php" hash="b2874c7fcde989dc6f7ccff4a25f5563"/><file name="CaptureController.php" hash="89e043bb3864617a062e915d2209dcf4"/><file name="ExportController.php" hash="7ca147debc5c1436b3bf2d9501592f33"/></dir><dir name="etc"><file name="adminhtml.xml" hash="26c4aa6d38306846a585166d6602b305"/><file name="config.xml" hash="7e0f193f12243b256e1f594b244d20cf"/><file name="system.xml" hash="115ba31309c00a99a924dc2862ac23f0"/></dir><dir name="sql"><dir name="emaildirect_setup"><file name="mysql4-install-2.0.0.php" hash="2ab06feda5e6ee37e8e5006921852f8f"/><file name="mysql4-upgrade-1.5.8-2.0.0.php" hash="20b98743a4ac747d90fec22ff4fbbe10"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="emaildirect"><file name="emaildirect-tab.png" hash="9ddb077b74a7078ac509d79b024631a1"/><file name="emaildirect.css" hash="cba2c50e351f973a2463e92a91ec5569"/><file name="logo.png" hash="2e7e39ced387c798ef27b77dd69f073e"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="emaildirect"><dir name="images"><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="emaildirect.css" hash="5b2c8907468d0d5d013e30c6c5c8c9ed"/><file name="integration.js" hash="72ffc0716bc87ac2c92ba47784b5d33b"/></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="9eb6f438b54472e217a9f8e99a8e117c"/></dir><dir name="template"><dir name="emaildirect"><dir name="abandoned"><file name="grid.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="status.phtml" hash="9e7723dc1fe5f8693345db9cc7cda808"/></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="f64073616c5807d5ea32a13cc008ef4d"/></dir><dir name="form"><dir name="field"><dir name="export"><file name="date_range.phtml" hash="d2a91e7ba256fed67745ef1c284889cb"/><file name="orders.phtml" hash="7cc302d6bd638c111ca769ce2d23a1e1"/><file name="products.phtml" hash="b3e91d0fb47f26a3cc989f73f25a1e34"/></dir><dir name="signup"><file name="test.phtml" hash="636501cd90c6ab4231bea54efb16b2ff"/></dir><file name="array.phtml" hash="5415eeff311735624354468c886d39b5"/><file name="info.phtml" hash="19921a9ba4d9abd065ba7ab62e9946ce"/><file name="note.phtml" hash="6625a3771ba10daba5ded5570574716f"/><file name="trouble.phtml" hash="a6cbebe7956299a64c2f5ceab0c28651"/></dir></dir><file name="setup_check.phtml" hash="1814302f58a15fb1629446e074a7e1e0"/></dir><dir name="convert"><dir name="profile"><file name="export.phtml" hash="c829eeccb120ffe4c0b9f0ddf9c7ff9a"/></dir></dir></dir><dir name="troubleshooting"><dir name="view"><dir name="tab"><file name="download.phtml" hash="41dc4cc22f7a1c6fc9048bf936fb7953"/><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="a2541c4b82ef33c791794344893c0f2d"/></dir><dir name="template"><dir name="emaildirect"><dir name="capture"><file name="email.phtml" hash="564c6130cd5f03bcff2ac8580e17bd2a"/></dir><dir name="checkout"><file name="subscribe.phtml" hash="d57eb93aab4e0f1d58f1ec8b9ed24c50"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="info.phtml" hash="fb89b2a726be35932de32ec9417ba81a"/></dir><file name="lists.phtml" hash="4c697dcfa63ece1db7885cadb02982d1"/></dir></dir><dir name="signup"><file name="form.phtml" hash="4c7633e518f3374f722ccf22b51158da"/></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="90a441f2d0dff6c247f810274e8a76ab"/></dir></target></contents>
20
  <compatible/>
21
  <dependencies/>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EmailDirect_Integration</name>
4
+ <version>2.0.4</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>Update to ensure Force Subscription option succeeds when enabled.</notes>
 
 
 
 
12
  <authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
13
+ <date>2014-06-20</date>
14
+ <time>05:28:14</time>
15
+ <contents><target name="magecommunity"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><file name="Grid.php" hash="4a3f8d29d3d8feb13ae124297267ae85"/><file name="Status.php" hash="9a740fd8c63148532bbcf07d19f462df"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="d01c241e1c4a42cd08f087ad784ed78e"/></dir><dir name="Form"><dir name="Field"><dir name="Export"><file name="Orders.php" hash="5b101fadb6a64044b276eb07b21cf0a5"/><file name="Products.php" hash="32e13d4b7250890bf84aba87f25de03c"/><file name="Range.php" hash="4adac96fa53fa8e1449bae943a8cca80"/></dir><dir name="Signup"><file name="Test.php" hash="3b773dda25c62bc8cb28031931d67f9f"/></dir><file name="Addressmapfields.php" hash="97b75c8340d561e863a3985ad73ce228"/><file name="Common.php" hash="6a86cce53f6df6857ea79241fa281939"/><file name="Info.php" hash="246de52ea5d2349ecd7f103cbba8cb8f"/><file name="Mapfields.php" hash="16894c5d76df1293e63128e349700e05"/><file name="Note.php" hash="ef99a474bbc3a828c7a618132a80fe66"/><file name="Shippingmapfields.php" hash="589a74260f394a5eae1b57ca89a74a8b"/><file name="Troubleshooting.php" hash="ff6b463004ab037031acea4a6f1d8517"/></dir></dir></dir><dir name="Convert"><dir name="Profile"><dir name="Export"><file name="Orders.php" hash="947af2b0d8e3f7bc47c47b32cd434f18"/><file name="Products.php" hash="3f93e4789dbeb6710cd2742587d61726"/></dir><file name="Export.php" hash="ba879607ac0693e9db6251bbbc1676a1"/></dir></dir></dir><dir name="Troubleshooting"><dir name="View"><dir name="Tab"><file name="Download.php" hash="619916677df7c833e559aae74dae2aa0"/><file name="Info.php" hash="4dad4b18e215d6df8c8e6631b4323b53"/><file name="Log.php" hash="d3dcb67ca284358eaa70db517637da87"/><file name="Submit.php" hash="fe896683680ab10ada6b67e0e803ccce"/></dir><file name="Form.php" hash="e527a3a2335b109c48a69f06c1b0d01f"/></dir><file name="Tabs.php" hash="ab1fdbe561e8572c2c50cdbec9573f82"/><file name="View.php" hash="b2d83536aade45e41039875db85b3018"/></dir><file name="Abandoned.php" hash="515b0c172e093341a2e69cb75570e553"/></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"><dir name="Abandoned"><file name="Minutes.php" hash="e311f6de480fd4b63aee7f46ea412372"/></dir><file name="Action.php" hash="bf2243f50c9c6dafca26a5bcb889f372"/></dir></dir></dir></dir><file name="Capture.php" hash="b005beb856451f49178f2a6914fd5ae7"/><file name="Signup.php" hash="511c9376560cdc5f63b7dc00bdc205be"/></dir><dir name="Helper"><file name="Data.php" hash="c28c7bedaadf1fb7e6a0a0aaae56ed3d"/><file name="Fields.php" hash="a071611d146c1cbe453c9955c9251da0"/><file name="Upgrade.php" hash="407f12bce2c7c06c73a23d8ed853a038"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Abandoned"><file name="Collection.php" hash="5a64b4e8b672f80b4d9b6cc5a0d231eb"/></dir><dir name="Order"><file name="Collection.php" hash="43d343562cf7e54f1b36315aa5d1d4a7"/></dir><dir name="Session"><file name="Collection.php" hash="7d6a8283fdbc1207d709e2bbbc78906d"/></dir><file name="Abandoned.php" hash="485b3771906783d383de75ae9761e55c"/><file name="Order.php" hash="8d538a5737095a1ba0ad448c027b3afb"/><file name="Session.php" hash="516eeeb28038416dc885ed7af6a8a8b0"/></dir><dir name="Resource"><file name="Setup.php" hash="5b9a7a4c848b2bae6ef956a2fe4b862f"/></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Export"><file name="Batch.php" hash="96c51fc5c0b947750be4e612e32c83ab"/></dir><dir name="Send"><file name="Field.php" hash="8ecffa8ccce40f3b2db6513b24eb9200"/></dir><dir name="Signup"><file name="Opacity.php" hash="8eabed4c72e7347f0376c3d4cc1023a7"/><file name="Recurrence.php" hash="e11200bbc204b00486c373d8a4e6675e"/></dir><file name="Abandoned.php" hash="9881811b94f38be90bd20a99951a1903"/><file name="Abandonedlist.php" hash="66386003113d8589c9f3de4f03f538a8"/><file name="Additionallist.php" hash="254081820d07a8754a71743ea58a7af4"/><file name="Checkoutsubscribe.php" hash="fd90252a1f19649a420dae136ad2a2ba"/><file name="List.php" hash="d76e36c0198e509a63c663e827cc7940"/><file name="Publication.php" hash="635fae1c20981c0ca7b90007a00e99a7"/><file name="Sequence.php" hash="ec9718c2b5dc35c559e5c09e345eff88"/><file name="Source.php" hash="f3c246959c74f6d378f3e2d7b8148d7f"/><file name="States.php" hash="a746affc786d8165a98801e68cbf80ab"/><file name="Statuses.php" hash="9844a7a9c3b5c68df45c8f6c518acf16"/><file name="Time.php" hash="8acbb5cb33e66de1e408cf55d17a9398"/></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="5a339e0a5407cf05b161102fc65595bb"/><file name="Ftp.php" hash="d5335cfb68f99761d6902dd390a3d7a8"/><file name="Lists.php" hash="425d64b9256bbdbafa899c4138e78368"/><file name="Orders.php" hash="041ea2cf97c461d670022984e7ff608a"/><file name="Publications.php" hash="815715549df345ccb5b69ed65589aa53"/><file name="Sources.php" hash="c6caf0274f7d0c50114324bc47a490c4"/><file name="Subscribers.php" hash="1761d56b33e62b809ba7d380655d1d43"/></dir><file name="Abandoned.php" hash="93bd43b59b143dec15858a6fba6ae568"/><file name="Observer.php" hash="a4cc903f1482069bbe9c5f3b78ce5fb7"/><file name="Order.php" hash="b21426543cd46f799cd0743525120fb8"/><file name="Session.php" hash="c56ecf779dbfb2dae0030935af31911a"/></dir><dir name="controllers"><dir name="Admin"><file name="AbandonedController.php" hash="04be2181a65e505084b324188f1fd64d"/><file name="ExportController.php" hash="e4d3eb0b3a9ef9f3caa0146debc256bc"/><file name="TroubleshootingController.php" hash="3de9950849e08648d8872aea4760c992"/></dir><dir name="Customer"><file name="AccountController.php" hash="ae75c37519f8d9f671509ff9b7fb34a4"/></dir><file name="AbandonedController.php" hash="b2874c7fcde989dc6f7ccff4a25f5563"/><file name="CaptureController.php" hash="89e043bb3864617a062e915d2209dcf4"/><file name="ExportController.php" hash="7ca147debc5c1436b3bf2d9501592f33"/></dir><dir name="etc"><file name="adminhtml.xml" hash="26c4aa6d38306846a585166d6602b305"/><file name="config.xml" hash="6f22b4e9ee2f6e96553125cc03f6bf2e"/><file name="system.xml" hash="115ba31309c00a99a924dc2862ac23f0"/></dir><dir name="sql"><dir name="emaildirect_setup"><file name="mysql4-install-2.0.0.php" hash="5f540ec379bcf9147ad4a06786312ead"/><file name="mysql4-upgrade-1.5.8-2.0.0.php" hash="30261e30722c8076e911fb76fddf4c65"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="emaildirect"><file name="emaildirect-tab.png" hash="9ddb077b74a7078ac509d79b024631a1"/><file name="emaildirect.css" hash="cba2c50e351f973a2463e92a91ec5569"/><file name="logo.png" hash="2e7e39ced387c798ef27b77dd69f073e"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="emaildirect"><dir name="images"><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="emaildirect.css" hash="5b2c8907468d0d5d013e30c6c5c8c9ed"/><file name="integration.js" hash="72ffc0716bc87ac2c92ba47784b5d33b"/></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="9eb6f438b54472e217a9f8e99a8e117c"/></dir><dir name="template"><dir name="emaildirect"><dir name="abandoned"><file name="grid.phtml" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="status.phtml" hash="9e7723dc1fe5f8693345db9cc7cda808"/></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="f64073616c5807d5ea32a13cc008ef4d"/></dir><dir name="form"><dir name="field"><dir name="export"><file name="date_range.phtml" hash="d2a91e7ba256fed67745ef1c284889cb"/><file name="orders.phtml" hash="7cc302d6bd638c111ca769ce2d23a1e1"/><file name="products.phtml" hash="b3e91d0fb47f26a3cc989f73f25a1e34"/></dir><dir name="signup"><file name="test.phtml" hash="636501cd90c6ab4231bea54efb16b2ff"/></dir><file name="array.phtml" hash="5415eeff311735624354468c886d39b5"/><file name="info.phtml" hash="19921a9ba4d9abd065ba7ab62e9946ce"/><file name="note.phtml" hash="6625a3771ba10daba5ded5570574716f"/><file name="trouble.phtml" hash="a6cbebe7956299a64c2f5ceab0c28651"/></dir></dir><file name="setup_check.phtml" hash="1814302f58a15fb1629446e074a7e1e0"/></dir><dir name="convert"><dir name="profile"><file name="export.phtml" hash="c829eeccb120ffe4c0b9f0ddf9c7ff9a"/></dir></dir></dir><dir name="troubleshooting"><dir name="view"><dir name="tab"><file name="download.phtml" hash="41dc4cc22f7a1c6fc9048bf936fb7953"/><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="a2541c4b82ef33c791794344893c0f2d"/></dir><dir name="template"><dir name="emaildirect"><dir name="capture"><file name="email.phtml" hash="564c6130cd5f03bcff2ac8580e17bd2a"/></dir><dir name="checkout"><file name="subscribe.phtml" hash="d57eb93aab4e0f1d58f1ec8b9ed24c50"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="info.phtml" hash="fb89b2a726be35932de32ec9417ba81a"/></dir><file name="lists.phtml" hash="4c697dcfa63ece1db7885cadb02982d1"/></dir></dir><dir name="signup"><file name="form.phtml" hash="4c7633e518f3374f722ccf22b51158da"/></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="90a441f2d0dff6c247f810274e8a76ab"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>