EmailDirect_Integration - Version 2.0.16

Version Notes

Grouped product price fixes.

Cron troubleshooting page.

Download this release

Release Info

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


Code changes from version 2.0.15 to 2.0.16

Files changed (10) hide show
  1. app/code/community/EmailDirect/Integration/Block/Adminhtml/Abandoned.php +2 -1
  2. app/code/community/EmailDirect/Integration/Block/Adminhtml/Troubleshooting/View/Tab/Cron.php +194 -0
  3. app/code/community/EmailDirect/Integration/Block/Widget/Grid/Column/Renderer/Abandoned/Minutes.php +9 -8
  4. app/code/community/EmailDirect/Integration/Helper/Data.php +17 -7
  5. app/code/community/EmailDirect/Integration/Helper/Order.php +3 -2
  6. app/code/community/EmailDirect/Integration/etc/config.xml +3 -1
  7. app/design/adminhtml/default/default/layout/emaildirect.xml +10 -9
  8. app/design/adminhtml/default/default/template/emaildirect/troubleshooting/view/tab/cron.phtml +144 -0
  9. package.xml +6 -6
  10. skin/adminhtml/default/default/emaildirect/emaildirect.css +7 -4
app/code/community/EmailDirect/Integration/Block/Adminhtml/Abandoned.php CHANGED
@@ -34,7 +34,8 @@ class EmailDirect_Integration_Block_Adminhtml_Abandoned extends Mage_Adminhtml_B
34
  $data = Mage::helper('emaildirect')->getCronLastRun(0,'cron_last_run');
35
 
36
  if ($data['class'] == 'ab_ng')
37
- Mage::getSingleton('adminhtml/session')->addWarning("There appears to be a problem with your cron settings. Please make sure that cron is running so that Abandoned Carts can be processed.");
 
38
 
39
  parent::__construct();
40
  $this->_removeButton('add');
34
  $data = Mage::helper('emaildirect')->getCronLastRun(0,'cron_last_run');
35
 
36
  if ($data['class'] == 'ab_ng')
37
+ $url = Mage::helper('emaildirect')->getAdminUrl("ed_integration/admin_troubleshooting/index",array('active_tab' => 'trouble_cron'));
38
+ Mage::getSingleton('adminhtml/session')->addWarning("There appears to be a problem with your cron settings. Please make sure that cron is running so that Abandoned Carts can be processed. Click <a href='{$url}'>here</a> for more information.");
39
 
40
  parent::__construct();
41
  $this->_removeButton('add');
app/code/community/EmailDirect/Integration/Block/Adminhtml/Troubleshooting/View/Tab/Cron.php ADDED
@@ -0,0 +1,194 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class EmailDirect_Integration_Block_Adminhtml_Troubleshooting_View_Tab_Cron
4
+ extends Mage_Adminhtml_Block_Template
5
+ implements Mage_Adminhtml_Block_Widget_Tab_Interface
6
+ {
7
+
8
+ protected $_status_types = array();
9
+ protected $_helper = null;
10
+ protected $_mode = "standard";
11
+
12
+ public function setMode($mode)
13
+ {
14
+ $this->_mode = $mode;
15
+ }
16
+
17
+ public function getMode()
18
+ {
19
+ return $this->_mode;
20
+ }
21
+
22
+ public function getTabLabel()
23
+ {
24
+ return Mage::helper('emaildirect')->__('Cron');
25
+ }
26
+
27
+ public function getTabTitle()
28
+ {
29
+ return Mage::helper('emaildirect')->__('Cron');
30
+ }
31
+
32
+ public function canShowTab()
33
+ {
34
+ return true;
35
+ }
36
+
37
+ public function isHidden()
38
+ {
39
+ return false;
40
+ }
41
+
42
+ public function getScheduleRowLimit()
43
+ {
44
+ return Mage::helper('emaildirect')->config('schedule_row_limit');
45
+ }
46
+
47
+ public function __construct()
48
+ {
49
+ $this->_helper = Mage::helper('emaildirect');
50
+ $this->_status_types = array(
51
+ 'abandoned' => 'Abandoned Carts',
52
+ );
53
+
54
+ parent::__construct();
55
+ $this->setTemplate('emaildirect/troubleshooting/view/tab/cron.phtml');
56
+ }
57
+
58
+ public function getCronStatus()
59
+ {
60
+ $data = array();
61
+
62
+ $cron_status = array();
63
+
64
+ foreach ($this->_status_types as $type => $label) {
65
+ $cron_status[$label] = $this->_helper->getAbandonedStatus(false);
66
+ }
67
+
68
+ $data['cron_status'] = $cron_status;
69
+
70
+ $data['schedule']['info'] = $this->getTableInfo('cron_schedule');
71
+ $data['schedule']['rows'] = $this->getScheduleRows();
72
+
73
+ $last_success = $this->getLastSuccess();
74
+ $minutes = $this->_helper->getMinutesSince($last_success);
75
+
76
+ $early = true;
77
+
78
+ if ($minutes > $this->_helper->getCronNotRunMinutes()) {
79
+ $early = false;
80
+ }
81
+ $data['last_success'] = array(
82
+ 'date' => $last_success,
83
+ 'minutes' => $minutes,
84
+ 'early' => $early,
85
+ 'elapsed' => $this->_helper->timeElapsed2string($last_success)
86
+ );
87
+
88
+ $data['last_emaildirect_success'] = $this->getLastEmailDirectSuccess();
89
+
90
+
91
+ return $data;
92
+ }
93
+
94
+ private function getLastSuccess()
95
+ {
96
+ $table_name = $this->getCronTable();
97
+
98
+ $sql = "SELECT * FROM `{$table_name}` ORDER BY finished_at DESC LIMIT 50";
99
+
100
+ $rows = $this->query($sql);
101
+
102
+ if (isset($rows[0])) {
103
+ return $rows[0]['finished_at'];
104
+ }
105
+
106
+ return null;
107
+ }
108
+
109
+ private function getLastEmailDirectSuccess()
110
+ {
111
+ $data = array('working' => false);
112
+ $table_name = $this->getCronTable();
113
+
114
+ $sql = "SELECT * FROM `{$table_name}` WHERE job_code LIKE 'emaildirect%' ORDER BY finished_at DESC LIMIT 50";
115
+
116
+ $rows = $this->query($sql);
117
+
118
+ if (isset($rows[0])) {
119
+ $row = $rows[0];
120
+
121
+ $last_success = $row['finished_at'];
122
+ $minutes = $this->_helper->getMinutesSince($last_success);
123
+ $working = true;
124
+
125
+ if ($minutes > $this->_helper->getCronNotRunMinutes()) {
126
+ $working = false;
127
+ }
128
+
129
+ $data = array(
130
+ 'date' => $last_success,
131
+ 'elapsed' => $this->_helper->timeElapsed2string($last_success),
132
+ 'minutes' => $minutes,
133
+ 'code' => $row['job_code'],
134
+ 'working' => $working,
135
+ 'label' => $this->getJobLabel($row['job_code'])
136
+ );
137
+ }
138
+
139
+ return $data;
140
+ }
141
+
142
+ private function getJobLabel($code)
143
+ {
144
+ $code = str_replace('emaildirect_integration_','',$code);
145
+
146
+ if ($code == 'latest_orders') {
147
+ $code = 'latest';
148
+ }
149
+
150
+ if (isset($this->_status_types[$code])) {
151
+ return $this->_status_types[$code];
152
+ }
153
+ return $code;
154
+ }
155
+
156
+
157
+ private function getTableInfo($table)
158
+ {
159
+ $table_name = $this->getCronTable();
160
+
161
+ $sql = "SHOW TABLE STATUS LIKE '{$table_name}'";
162
+
163
+ $status = $this->query($sql);
164
+
165
+ if (isset($status[0]))
166
+ return $status[0];
167
+
168
+ return array();
169
+ }
170
+
171
+ private function getScheduleRows()
172
+ {
173
+ $table_name = $this->getCronTable();
174
+
175
+ $sql = "SELECT * FROM `{$table_name}` ORDER BY schedule_id DESC LIMIT " . $this->getScheduleRowLimit();
176
+
177
+ return $this->query($sql);
178
+ }
179
+
180
+ private function getCronTable()
181
+ {
182
+ return Mage::getSingleton('core/resource')->getTableName('cron_schedule');
183
+ }
184
+
185
+ private function query($sql)
186
+ {
187
+ $rows = Mage::getSingleton('core/resource')
188
+ ->getConnection('core_read')
189
+ ->query($sql)
190
+ ->fetchAll();
191
+
192
+ return $rows;
193
+ }
194
+ }
app/code/community/EmailDirect/Integration/Block/Widget/Grid/Column/Renderer/Abandoned/Minutes.php CHANGED
@@ -1,23 +1,24 @@
1
  <?php
2
- class EmailDirect_Integration_Block_Widget_Grid_Column_Renderer_Abandoned_Minutes extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
3
  {
4
  public function render(Varien_Object $row)
5
  {
6
  $processed_date = $row->getData('date_sent');
7
-
8
  if ($processed_date != "")
9
  return "";
10
-
11
  $abandoned_date = strtotime($row->getData('updated_at'));
12
-
13
  $current_date = Mage::getModel('core/date')->gmtTimestamp();
14
-
15
  $minutes = round(abs($current_date - $abandoned_date) / 60,0);
16
-
17
  $class = 'ab_ok';
18
- if ($minutes > 60)
19
  $class = 'ab_ng';
20
-
 
21
  return "<span class='{$class}'>{$minutes}</span>";
22
  }
23
  }
1
  <?php
2
+ class EmailDirect_Integration_Block_Widget_Grid_Column_Renderer_Abandoned_Minutes extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
3
  {
4
  public function render(Varien_Object $row)
5
  {
6
  $processed_date = $row->getData('date_sent');
7
+
8
  if ($processed_date != "")
9
  return "";
10
+
11
  $abandoned_date = strtotime($row->getData('updated_at'));
12
+
13
  $current_date = Mage::getModel('core/date')->gmtTimestamp();
14
+
15
  $minutes = round(abs($current_date - $abandoned_date) / 60,0);
16
+
17
  $class = 'ab_ok';
18
+ if ($minutes > Mage::helper('emaildirect')->getCronNotRunMinutes()) {
19
  $class = 'ab_ng';
20
+ }
21
+
22
  return "<span class='{$class}'>{$minutes}</span>";
23
  }
24
  }
app/code/community/EmailDirect/Integration/Helper/Data.php CHANGED
@@ -33,6 +33,16 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
33
  $this->_logger->debugHeader($data, $level);
34
  }
35
 
 
 
 
 
 
 
 
 
 
 
36
  public function getMergeVars($customer)
37
  {
38
  $merge_vars = array();
@@ -611,13 +621,13 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
611
  return $this->getFullStoreName($store);
612
  }
613
 
614
- public function getAbandonedStatus()
615
  {
616
  $stores = Mage::app()->getStores();
617
 
618
  $abandoned_status = array(
619
  'enabled' => false,
620
- 'cron_last_run' => $this->getCronLastRunHtml(),
621
  'stores' => array()
622
  );
623
 
@@ -653,7 +663,7 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
653
 
654
  $data['minutes'] = $minutes;
655
 
656
- if ($minutes > 60)
657
  $data['class'] = 'ab_ng';
658
  else
659
  $data['class'] = 'ab_ok';
@@ -673,12 +683,12 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
673
  return $data;
674
  }
675
 
676
- private function getLastRunHtml($store = null, $config = 'abandoned_last_run')
677
  {
678
  $data = $this->getCronLastRun($store,$config);
679
  $warning_img = "";
680
 
681
- if ($data['class'] == "ab_ng")
682
  $warning_img = "<a href='" . $this->getAdminUrl("ed_integration/admin_troubleshooting/index") . "#abandoned_carts' target='_blank'><img src='" . Mage::getDesign()->getSkinUrl('images/warning_msg_icon.gif') . "' class='cron_warning' /></a>";
683
 
684
  $time_elapsed = "";
@@ -694,9 +704,9 @@ class EmailDirect_Integration_Helper_Data extends Mage_Core_Helper_Abstract
694
  return $this->getLastRunHtml($store);
695
  }
696
 
697
- public function getCronLastRunHtml()
698
  {
699
- return $this->getLastRunHtml(0, 'cron_last_run');
700
  }
701
 
702
  public function getAdminUrlParams($params = array())
33
  $this->_logger->debugHeader($data, $level);
34
  }
35
 
36
+ public function getCronNotRunMinutes()
37
+ {
38
+ return $this->config('cron_not_run_minutes');
39
+ }
40
+
41
+ public function getMinutesSince($date)
42
+ {
43
+ return round(abs(time() - strtotime($date)) / 60,0);
44
+ }
45
+
46
  public function getMergeVars($customer)
47
  {
48
  $merge_vars = array();
621
  return $this->getFullStoreName($store);
622
  }
623
 
624
+ public function getAbandonedStatus($helpLink = true)
625
  {
626
  $stores = Mage::app()->getStores();
627
 
628
  $abandoned_status = array(
629
  'enabled' => false,
630
+ 'cron_last_run' => $this->getCronLastRunHtml($helpLink),
631
  'stores' => array()
632
  );
633
 
663
 
664
  $data['minutes'] = $minutes;
665
 
666
+ if ($minutes > $this->getCronNotRunMinutes())
667
  $data['class'] = 'ab_ng';
668
  else
669
  $data['class'] = 'ab_ok';
683
  return $data;
684
  }
685
 
686
+ private function getLastRunHtml($store = null, $config = 'abandoned_last_run', $helpLink = true)
687
  {
688
  $data = $this->getCronLastRun($store,$config);
689
  $warning_img = "";
690
 
691
+ if ($data['class'] == "ab_ng" && $helpLink)
692
  $warning_img = "<a href='" . $this->getAdminUrl("ed_integration/admin_troubleshooting/index") . "#abandoned_carts' target='_blank'><img src='" . Mage::getDesign()->getSkinUrl('images/warning_msg_icon.gif') . "' class='cron_warning' /></a>";
693
 
694
  $time_elapsed = "";
704
  return $this->getLastRunHtml($store);
705
  }
706
 
707
+ public function getCronLastRunHtml($helpLink = true)
708
  {
709
+ return $this->getLastRunHtml(0, 'cron_last_run', $helpLink);
710
  }
711
 
712
  public function getAdminUrlParams($params = array())
app/code/community/EmailDirect/Integration/Helper/Order.php CHANGED
@@ -278,7 +278,7 @@ class EmailDirect_Integration_Helper_Order extends EmailDirect_Integration_Helpe
278
  }
279
  else
280
  {
281
- if ($parent_item != null && get_class($parent_item) != 'Varien_Object' ) {
282
  $cost = $parent_item->getPrice();
283
  } else {
284
  $cost = $item->getPrice();
@@ -290,8 +290,9 @@ class EmailDirect_Integration_Helper_Order extends EmailDirect_Integration_Helpe
290
  }
291
 
292
  $merge_vars["{$prefix}ProductName{$pos}"] = $name;
293
- if ($prefix != 'Related')
294
  $merge_vars["{$prefix}ParentName{$pos}"] = $parent_name;
 
295
 
296
  $merge_vars["{$prefix}SKU{$pos}"] = $sku;
297
  $merge_vars["{$prefix}URL{$pos}"] = $url;
278
  }
279
  else
280
  {
281
+ if ($parent_item != null && get_class($parent_item) != 'Varien_Object') {
282
  $cost = $parent_item->getPrice();
283
  } else {
284
  $cost = $item->getPrice();
290
  }
291
 
292
  $merge_vars["{$prefix}ProductName{$pos}"] = $name;
293
+ if ($prefix != 'Related') {
294
  $merge_vars["{$prefix}ParentName{$pos}"] = $parent_name;
295
+ }
296
 
297
  $merge_vars["{$prefix}SKU{$pos}"] = $sku;
298
  $merge_vars["{$prefix}URL{$pos}"] = $url;
app/code/community/EmailDirect/Integration/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <EmailDirect_Integration>
5
- <version>2.0.15</version>
6
  </EmailDirect_Integration>
7
  </modules>
8
  <global>
@@ -278,6 +278,8 @@ C]]></abandonedsequence_options>
278
  <batch_size>200</batch_size>
279
  <batch_date_adjust>-1 week</batch_date_adjust>
280
  <wishlist_enabled>0</wishlist_enabled>
 
 
281
  </general>
282
  <export>
283
  <include_disabled>1</include_disabled>
2
  <config>
3
  <modules>
4
  <EmailDirect_Integration>
5
+ <version>2.0.16</version>
6
  </EmailDirect_Integration>
7
  </modules>
8
  <global>
278
  <batch_size>200</batch_size>
279
  <batch_date_adjust>-1 week</batch_date_adjust>
280
  <wishlist_enabled>0</wishlist_enabled>
281
+ <cron_not_run_minutes>80</cron_not_run_minutes>
282
+ <schedule_row_limit>50</schedule_row_limit>
283
  </general>
284
  <export>
285
  <include_disabled>1</include_disabled>
app/design/adminhtml/default/default/layout/emaildirect.xml CHANGED
@@ -8,7 +8,7 @@
8
  <block type="core/template" name="emaildirect_setup_check" before="-" template="emaildirect/system/config/setup_check.phtml" />
9
  </reference>
10
  </adminhtml_system_config_edit>
11
-
12
  <adminhtml_sales_order_view>
13
  <reference name="sales_order_tabs">
14
  <block type="emaildirect/adminhtml_order_view_tab_diagnostics" name="order_view_tab_emaildirect" template="emaildirect/diagnostics.phtml">
@@ -20,7 +20,7 @@
20
  </action>
21
  </reference>
22
  </adminhtml_sales_order_view>
23
-
24
  <ed_integration_admin_export_products>
25
  <remove name="root"/>
26
  <block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
@@ -35,7 +35,7 @@
35
  <block type="emaildirect/adminhtml_system_convert_profile_export_products" name="system_convert_profile_run" template="emaildirect/system/convert/profile/export.phtml" output="toHtml"/>
36
  </block>
37
  </ed_integration_admin_export_products>
38
-
39
  <ed_integration_admin_export_orders>
40
  <remove name="root"/>
41
  <block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
@@ -50,7 +50,7 @@
50
  <block type="emaildirect/adminhtml_system_convert_profile_export_orders" name="system_convert_profile_run" template="emaildirect/system/convert/profile/export.phtml" output="toHtml"/>
51
  </block>
52
  </ed_integration_admin_export_orders>
53
-
54
  <ed_integration_admin_troubleshooting_index>
55
  <reference name="head">
56
  <action method="addCss"><stylesheet>emaildirect/emaildirect.css</stylesheet></action>
@@ -62,17 +62,18 @@
62
  </block>
63
  </reference>
64
  <reference name="left">
65
- <block type="emaildirect/adminhtml_troubleshooting_tabs" name="trouble.tabs" as="trouble.tabs" template="widget/tabs.phtml" >
66
  <action method="addTab"><name>trouble_help</name><block>emaildirect/adminhtml_troubleshooting_view_tab_help</block></action>
67
  <action method="addTab"><name>trouble_settings</name><block>emaildirect/adminhtml_troubleshooting_view_tab_settings</block></action>
68
  <action method="addTab"><name>trouble_info</name><block>emaildirect/adminhtml_troubleshooting_view_tab_info</block></action>
69
  <action method="addTab"><name>trouble_log</name><block>emaildirect/adminhtml_troubleshooting_view_tab_log</block></action>
 
70
  <action method="addTab"><name>trouble_submit</name><block>emaildirect/adminhtml_troubleshooting_view_tab_submit</block></action>
71
  <action method="addTab"><name>trouble_download</name><block>emaildirect/adminhtml_troubleshooting_view_tab_download</block></action>
72
  </block>
73
  </reference>
74
  </ed_integration_admin_troubleshooting_index>
75
-
76
  <ed_integration_admin_abandoned_index>
77
  <reference name="head">
78
  <action method="addCss"><stylesheet>emaildirect/emaildirect.css</stylesheet></action>
@@ -82,7 +83,7 @@
82
  </block>
83
  </reference>
84
  </ed_integration_admin_abandoned_index>
85
-
86
  <ed_integration_admin_abandoned_details>
87
  <reference name="head">
88
  <action method="addCss"><stylesheet>emaildirect/emaildirect.css</stylesheet></action>
@@ -96,10 +97,10 @@
96
  <block type="emaildirect/adminhtml_abandoned_details_tab_diagnostics" name="abandoned_tab_details_emaildirect" template="emaildirect/diagnostics.phtml">
97
  <block type="emaildirect/adminhtml_abandoned_details_tab_diagnostics_status" name="diagnostic_status" template="emaildirect/abandoned/details/tab/diagnostics/status.phtml"></block>
98
  </block>
99
-
100
  <action method="addTab"><name>abandoned_cart</name><block>emaildirect/adminhtml_abandoned_details_tab_cart</block></action>
101
  <action method="addTab"><name>abandoned_details</name><block>abandoned_tab_details_emaildirect</block></action>
102
-
103
  </block>
104
  </reference>
105
  </ed_integration_admin_abandoned_details>
8
  <block type="core/template" name="emaildirect_setup_check" before="-" template="emaildirect/system/config/setup_check.phtml" />
9
  </reference>
10
  </adminhtml_system_config_edit>
11
+
12
  <adminhtml_sales_order_view>
13
  <reference name="sales_order_tabs">
14
  <block type="emaildirect/adminhtml_order_view_tab_diagnostics" name="order_view_tab_emaildirect" template="emaildirect/diagnostics.phtml">
20
  </action>
21
  </reference>
22
  </adminhtml_sales_order_view>
23
+
24
  <ed_integration_admin_export_products>
25
  <remove name="root"/>
26
  <block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
35
  <block type="emaildirect/adminhtml_system_convert_profile_export_products" name="system_convert_profile_run" template="emaildirect/system/convert/profile/export.phtml" output="toHtml"/>
36
  </block>
37
  </ed_integration_admin_export_products>
38
+
39
  <ed_integration_admin_export_orders>
40
  <remove name="root"/>
41
  <block type="adminhtml/page" name="convert_root" output="toHtml" template="page.phtml">
50
  <block type="emaildirect/adminhtml_system_convert_profile_export_orders" name="system_convert_profile_run" template="emaildirect/system/convert/profile/export.phtml" output="toHtml"/>
51
  </block>
52
  </ed_integration_admin_export_orders>
53
+
54
  <ed_integration_admin_troubleshooting_index>
55
  <reference name="head">
56
  <action method="addCss"><stylesheet>emaildirect/emaildirect.css</stylesheet></action>
62
  </block>
63
  </reference>
64
  <reference name="left">
65
+ <block type="emaildirect/adminhtml_troubleshooting_tabs" name="trouble.tabs" as="trouble.tabs" template="widget/tabs.phtml" >
66
  <action method="addTab"><name>trouble_help</name><block>emaildirect/adminhtml_troubleshooting_view_tab_help</block></action>
67
  <action method="addTab"><name>trouble_settings</name><block>emaildirect/adminhtml_troubleshooting_view_tab_settings</block></action>
68
  <action method="addTab"><name>trouble_info</name><block>emaildirect/adminhtml_troubleshooting_view_tab_info</block></action>
69
  <action method="addTab"><name>trouble_log</name><block>emaildirect/adminhtml_troubleshooting_view_tab_log</block></action>
70
+ <action method="addTab"><name>trouble_cron</name><block>emaildirect/adminhtml_troubleshooting_view_tab_cron</block></action>
71
  <action method="addTab"><name>trouble_submit</name><block>emaildirect/adminhtml_troubleshooting_view_tab_submit</block></action>
72
  <action method="addTab"><name>trouble_download</name><block>emaildirect/adminhtml_troubleshooting_view_tab_download</block></action>
73
  </block>
74
  </reference>
75
  </ed_integration_admin_troubleshooting_index>
76
+
77
  <ed_integration_admin_abandoned_index>
78
  <reference name="head">
79
  <action method="addCss"><stylesheet>emaildirect/emaildirect.css</stylesheet></action>
83
  </block>
84
  </reference>
85
  </ed_integration_admin_abandoned_index>
86
+
87
  <ed_integration_admin_abandoned_details>
88
  <reference name="head">
89
  <action method="addCss"><stylesheet>emaildirect/emaildirect.css</stylesheet></action>
97
  <block type="emaildirect/adminhtml_abandoned_details_tab_diagnostics" name="abandoned_tab_details_emaildirect" template="emaildirect/diagnostics.phtml">
98
  <block type="emaildirect/adminhtml_abandoned_details_tab_diagnostics_status" name="diagnostic_status" template="emaildirect/abandoned/details/tab/diagnostics/status.phtml"></block>
99
  </block>
100
+
101
  <action method="addTab"><name>abandoned_cart</name><block>emaildirect/adminhtml_abandoned_details_tab_cart</block></action>
102
  <action method="addTab"><name>abandoned_details</name><block>abandoned_tab_details_emaildirect</block></action>
103
+
104
  </block>
105
  </reference>
106
  </ed_integration_admin_abandoned_details>
app/design/adminhtml/default/default/template/emaildirect/troubleshooting/view/tab/cron.phtml ADDED
@@ -0,0 +1,144 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ $status = $this->getCronStatus();
3
+ $schedule = $status['schedule'];
4
+ $lastEmailDirectSuccess = $status['last_emaildirect_success'];
5
+ $mode = $this->getMode();
6
+ ?>
7
+
8
+ <?php if ($mode == "download"): ?>
9
+ <html>
10
+ <head>
11
+ <style>
12
+ table { border-collapse: collapse; }
13
+ table tr td { border: solid 1px; padding: 4px; }
14
+ h4 { border-bottom: solid 1px; }
15
+ </style>
16
+ </head>
17
+ <body>
18
+ <?php endif; ?>
19
+
20
+ <div class="entry-edit">
21
+ <div class="entry-edit-head">
22
+ <h4 class="icon-head"><?php echo Mage::helper('emaildirect')->__('Cron Troubleshooting') ?></h4>
23
+ </div>
24
+ <div class="fieldset">
25
+ <div class="hor-scroll">
26
+ <?php if ($lastEmailDirectSuccess['working']): ?>
27
+ <p>Cron seems to be working correctly.</p>
28
+ <?php else: ?>
29
+ <p>There appears to be a problem with your cron settings.</p>
30
+ <?php if ($schedule['info']['Rows'] == 0): ?>
31
+ <p>There are no entries in your cron schedule table. Please check your cron settings with your service provider.</p>
32
+ <?php else: ?>
33
+ <?php if ($status['last_success']['early']): ?>
34
+ <p>If the module was recently installed, it may be too early to check the cron status.</p>
35
+ <?php else: ?>
36
+ <p>It appears that cron was running at some point and has stopped working.</p>
37
+ <?php endif; ?>
38
+ <p>The last time that a cron job was executed: <strong><?php echo $status['last_success']['date'] . " (" . $status['last_success']['elapsed'] . " ago)"; ?></strong></p>
39
+ <?php if (!isset($lastEmailDirectSuccess['date']) || ($lastEmailDirectSuccess['date'] == null)): ?>
40
+ <p>None of the EmailDirect cron jobs have been executed. Please check the Exception.log file for information or enable EmailDirect logging to check the emaildirect.log file which can be viewed in the troubleshooting section.</p>
41
+ <?php else: ?>
42
+ <p>The last time that a EmailDirect cron job was executed: <strong><?php echo $lastEmailDirectSuccess['date'] . " (" . $lastEmailDirectSuccess['elapsed'] . " ago)"; ?></strong></p>
43
+
44
+ <?php endif; ?>
45
+ <?php endif; ?>
46
+ <?php if ($mode != "download"): ?>
47
+ <form id='download_form' method='post' action='<?php echo $this->getUrl("emaildirect_dashboard/admin_troubleshooting/downloadCron") ?>'>
48
+ <input type='hidden' name='form_key' value='<?php echo $this->getFormKey(); ?>'></input>
49
+ </form>
50
+ <button id='download' onclick='return performDownload()'>Download Report</button>
51
+ <?php endif; ?>
52
+ <?php endif; ?>
53
+ </div>
54
+ </div>
55
+ </div>
56
+
57
+ <div class="entry-edit">
58
+ <div class="entry-edit-head">
59
+ <h4 class="icon-head"><?php echo Mage::helper('emaildirect')->__('EmailDirect Cron Status') ?></h4>
60
+ </div>
61
+ </div>
62
+ <div class="grid np">
63
+ <div class="hor-scroll">
64
+ <table cellspacing="0" class="data ed-config-table">
65
+ <thead>
66
+ <tr class="headings">
67
+ <th>Cron Job</th>
68
+ <th>Last Run</th>
69
+ <th>Enabled</th>
70
+ </tr>
71
+ </thead>
72
+ <tbody>
73
+ <?php foreach ($status['cron_status'] as $label => $cron_status): ?>
74
+ <tr>
75
+ <td><?php echo $label ?></td>
76
+ <td><?php echo $cron_status['cron_last_run']; ?></td>
77
+ <td><?php if ($cron_status['enabled']) echo "Enabled"; else echo "Disabled"; ?></td>
78
+ </tr>
79
+ <?php endforeach; ?>
80
+ </tbody>
81
+ </table>
82
+ </div>
83
+ </div>
84
+ <br />
85
+ <div class="entry-edit">
86
+ <div class="entry-edit-head">
87
+ <h4 class="icon-head"><?php echo Mage::helper('emaildirect')->__('Cron Schedule Table (Last %s Rows)', $this->getScheduleRowLimit()) ?></h4>
88
+ </div>
89
+ </div>
90
+ <div class="grid np">
91
+ <div class="hor-scroll">
92
+ <table cellspacing="0" class="data ed-config-table">
93
+ <thead>
94
+ <tr class="headings">
95
+ <th width='1%'>Schedule ID</th>
96
+ <th>Job Code</th>
97
+ <th>Status</th>
98
+ <th>Messages</th>
99
+ <th>Created At</th>
100
+ <th>Scheduled At</th>
101
+ <th>Executed At</th>
102
+ <th>Finished At</th>
103
+ </tr>
104
+ </thead>
105
+ <?php $class = "even"; ?>
106
+ <tbody>
107
+ <?php foreach ($status['schedule']['rows'] as $row): ?>
108
+ <?php $code = $row['job_code']; ?>
109
+ <?php $extra_class = ""; ?>
110
+ <?php if (strpos($code,'emaildirect') !== FALSE) {
111
+ if ($row['executed_at'] == null) {
112
+ $extra_class = " emaildirect_schedule_failure";
113
+ } else {
114
+ $extra_class = " emaildirect_schedule_success";
115
+ }
116
+ }
117
+ ?>
118
+ <tr class='border <?php echo $class . $extra_class ?>'>
119
+ <?php foreach ($row as $column): ?>
120
+ <td><?php echo $column; ?></td>
121
+ <?php endforeach; ?>
122
+ </tr>
123
+
124
+ <?php $class = ($class == 'even' ? 'odd' : 'even'); ?>
125
+ <?php endforeach; ?>
126
+ </tbody>
127
+ </table>
128
+ </div>
129
+ </div>
130
+
131
+ <?php if ($mode == "download"): ?>
132
+ </body>
133
+ </html>
134
+ <?php else: ?>
135
+ <script type='text/javascript'>
136
+
137
+ function performDownload()
138
+ {
139
+ $("download_form").submit();
140
+ return false;
141
+ }
142
+ </script>
143
+ <?php endif; ?>
144
+
package.xml CHANGED
@@ -1,20 +1,20 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EmailDirect_Integration</name>
4
- <version>2.0.15</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>Grouped product fixes.&#xD;
12
  &#xD;
13
- Permissions updated to allow access to admin pages for specific roles.</notes>
14
  <authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
15
- <date>2015-08-03</date>
16
- <time>21:17:56</time>
17
- <contents><target name="magecommunity"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><dir name="Details"><dir name="Tab"><dir name="Diagnostics"><file name="Status.php" hash="8706487c8f465a5ce762cd923258bb35"/></dir><file name="Cart.php" hash="09e9331f6c72157f581ad7135b7f147c"/><file name="Diagnostics.php" hash="eba18ce04ccb125ce4aa6ed5e473734a"/></dir><file name="Form.php" hash="dffc6e49eb95db2f83050706eee1fd55"/></dir><file name="Details.php" hash="9f98f4dd9ea741f9f7dd2eb018af0d7d"/><file name="Grid.php" hash="e0a15673636acb7e113fdf6e3bcd8879"/><file name="Status.php" hash="9a740fd8c63148532bbcf07d19f462df"/><file name="Tabs.php" hash="19e184e72777dfc5b0c35b7027a3e1cf"/></dir><dir name="Diagnostics"><dir name="Status"><file name="Abstract.php" hash="4a54d82d748f880fc5bb8263935ddc98"/></dir></dir><dir name="Order"><dir name="View"><dir name="Tab"><dir name="Diagnostics"><file name="Status.php" hash="b4dd8410aa9ce649e603762d5d14f314"/></dir><file name="Diagnostics.php" hash="91bb6af0c9a0e6f41d2575651e8a59ef"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="25796ead15053f86d7adcd551b8b49e7"/></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="Api.php" hash="77dabda85973dc72227937397392c411"/><file name="Common.php" hash="6a86cce53f6df6857ea79241fa281939"/><file name="Diagnostics.php" hash="7efe5c8b90db90e9c512842388d3263d"/><file name="Info.php" hash="246de52ea5d2349ecd7f103cbba8cb8f"/><file name="Logging.php" hash="53b0b7d28d2680e479bfa89b6884802d"/><file name="Mapfields.php" hash="16894c5d76df1293e63128e349700e05"/><file name="Note.php" hash="ef99a474bbc3a828c7a618132a80fe66"/><file name="Shippingmapfields.php" hash="589a74260f394a5eae1b57ca89a74a8b"/></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="Help.php" hash="ad4007af59687653f4d6692f2b42b31d"/><file name="Info.php" hash="be5c15da32ef0e042c53d8ac007f8bd6"/><file name="Log.php" hash="a61e66923a287beee5910511b7282a0a"/><file name="Settings.php" hash="f15e57cdc6539c4da84042c98f0ab25c"/><file name="Submit.php" hash="81ae0e0636b66a329cf8f39939788d1d"/></dir><file name="Form.php" hash="e527a3a2335b109c48a69f06c1b0d01f"/></dir><file name="Status.php" hash="d140afcad424ff531bebb412539d6f1c"/><file name="Tabs.php" hash="5d4168cec60212beb87997e6391282e9"/><file name="View.php" hash="47efa0685db07fb73544ad477a0e2c85"/></dir><file name="Abandoned.php" hash="6e51c09f3c9d491f14ee6ecfb7f33f08"/></dir><dir name="Checkout"><file name="Subscribe.php" hash="a49c1e7f612d379e6509658a56f53d7d"/></dir><dir name="Customer"><dir name="Account"><file name="Lists.php" hash="e1b911c77a78995d3b3390363926ae5a"/></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="e44034ad875957a566d3ac89abb408ed"/><file name="Signup.php" hash="c51c2e5cb93978170a65dc4b69d197bf"/></dir><dir name="Controller"><dir name="Front"><file name="Abstract.php" hash="48d93179d5f8a6b416fd82dd8763daf9"/></dir></dir><dir name="Helper"><file name="Abandoned.php" hash="7910bd8db8a030ae22adae9469d91fe7"/><file name="Data.php" hash="d85791021c4d296445e545dcc7c3eb85"/><file name="Diagnostic.php" hash="68867fd906405a6be98e14c1568437b6"/><file name="Fields.php" hash="5fa737c45be172f55fe965975aa6db52"/><file name="Order.php" hash="b87142e32a71a73d9d93a4c4f4a7c202"/><file name="Troubleshooting.php" hash="cf422b72b445a86326e73cbc6f506e18"/></dir><dir name="Model"><dir name="Abandoned"><file name="Observer.php" hash="00f8e4f8186a6c800df932b74b147844"/></dir><dir name="Configuration"><file name="Observer.php" hash="9a188656d5f7d73c91bf4221cc6e4aac"/></dir><dir name="Customer"><file name="Observer.php" hash="cef8d32ba304c51b448343555ea6a066"/></dir><dir name="Mysql4"><dir name="Abandoned"><file name="Collection.php" hash="1a9129267942a98ac3830ceaf714c2ab"/></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="Newsletter"><file name="Observer.php" hash="d3181ac610e920dead78fff5656f65de"/></dir><dir name="Observer"><file name="Abstract.php" hash="1db39dc86bed51af1d2a3b4df50099bd"/></dir><dir name="Order"><file name="Observer.php" hash="17cd32f5111f0e423ac3a5d8dd62b256"/></dir><dir name="Resource"><file name="Setup.php" hash="2b4fc64eaafbd5f41f95f219871275df"/></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="b81d7f2cb03b8482debea5cd6a2bd1c5"/><file name="Additionallist.php" hash="9f109ab04c7ae7832887572b26868e3a"/><file name="Checkoutsubscribe.php" hash="fd90252a1f19649a420dae136ad2a2ba"/><file name="List.php" hash="84c1c8e27f579d5d33992fcb15202748"/><file name="Publication.php" hash="a5bc0192605fc558fe59b37cc0462825"/><file name="Sequence.php" hash="a599f218882d2cfc68dfcf4d58a98a41"/><file name="Source.php" hash="44815cbf4ac6443032df1e7d9c4cadef"/><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="e38737d197b2ccd6700ec87ec1836456"/><file name="Ftp.php" hash="d5335cfb68f99761d6902dd390a3d7a8"/><file name="Lists.php" hash="425d64b9256bbdbafa899c4138e78368"/><file name="Orders.php" hash="fa1c481787b0f994c1c1f704f73d6741"/><file name="Publications.php" hash="1bebd172a8bba669d075f09589785652"/><file name="Sources.php" hash="c6caf0274f7d0c50114324bc47a490c4"/><file name="Subscribers.php" hash="53a2c24db3936b7768ae6a8a8f98f394"/><file name="Wishlist.php" hash="2ceb111bbeaa06c4f13f61281aaa5b5e"/></dir><file name="Abandoned.php" hash="b5e001d0bc059c66ef38130b7d6dcec0"/><file name="Observer.php" hash="37a2d4c63e4ef75d535426a8670764f1"/><file name="Order.php" hash="b21426543cd46f799cd0743525120fb8"/><file name="Session.php" hash="c56ecf779dbfb2dae0030935af31911a"/></dir><dir name="controllers"><dir name="Admin"><file name="AbandonedController.php" hash="a5df99cae9322d66954111aaa8be5661"/><file name="DiagnosticController.php" hash="9dd175698b69c2bf59eee728d72726dd"/><file name="ExportController.php" hash="5bb090e4997e9c45367837c66fb9fd01"/><file name="TroubleshootingController.php" hash="02dffffc761bf1ac82ac18f51c75c976"/></dir><dir name="Customer"><file name="AccountController.php" hash="91942750c1c3d20dc31159c1ffbe8200"/></dir><file name="AbandonedController.php" hash="39c9d1a72bca9369a3121ac15f68558e"/><file name="CaptureController.php" hash="89e043bb3864617a062e915d2209dcf4"/><file name="ExportController.php" hash="7ca147debc5c1436b3bf2d9501592f33"/><file name="SignupController.php" hash="fe975d44cc11f1270d34d9d82c7d4be9"/></dir><dir name="etc"><file name="adminhtml.xml" hash="61d894b12944956c74b41f5f96956c2c"/><file name="cache.xml" hash="9f7ad708d6507ec880473689e70ef314"/><file name="config.xml" hash="c9e957ffead8e022282474d2fb835243"/><file name="system.xml" hash="38f8dfb41b5fcc55490daf4d7c6e147c"/></dir><dir name="sql"><dir name="emaildirect_setup"><file name="mysql4-install-2.0.0.php" hash="bdc5e09fe949b36534c50c85fd198e66"/><file name="mysql4-upgrade-1.5.8-2.0.0.php" hash="8f33c7f6dca96cfa8210ec1fe016d95b"/><file name="mysql4-upgrade-2.0.0-2.0.14.php" hash="ead09ac13bb7798b08776dda5948f91d"/></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="61d3d7b29b97f75023f2232cae6eb0c1"/><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="c9caf9ea168efa3b0d6f4b881bcf093c"/><file name="integration.js" hash="7980204c0f594b180b9fa336954c9229"/></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="7767cd483e20d1930c0f1d79fee03b2a"/></dir><dir name="template"><dir name="emaildirect"><dir name="abandoned"><dir name="details"><dir name="tab"><dir name="diagnostics"><file name="status.phtml" hash="24829356b9dba966e53fb1cfe0f192b6"/></dir><file name="cart.phtml" hash="be7ca2b147fc836c2ca547b290ffe841"/></dir><file name="form.phtml" hash="60633d212382770e99d11d24ae919e47"/></dir><file name="details.phtml" hash="9d467b97a2d773aec950bea7061c6730"/><file name="status.phtml" hash="9e7723dc1fe5f8693345db9cc7cda808"/></dir><dir name="order"><dir name="view"><dir name="tab"><dir name="diagnostics"><file name="status.phtml" hash="a3bdecb1ec08903dd1b61dce6992e190"/></dir></dir></dir></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="176f3ddb8ea667a64a06967351526f3c"/></dir><dir name="form"><dir name="field"><dir name="export"><file name="date_range.phtml" hash="6a37b1e58456e1dcec734c48deb8c0c1"/><file name="orders.phtml" hash="1dfa19a712b18d2c95c2f4b938f6acef"/><file name="products.phtml" hash="098b7b21b6424c2a4eea26194883a623"/></dir><dir name="signup"><file name="test.phtml" hash="636501cd90c6ab4231bea54efb16b2ff"/></dir><file name="api.phtml" hash="468f33b2a23dbe2828489c1620000c74"/><file name="array.phtml" hash="5415eeff311735624354468c886d39b5"/><file name="diagnostics.phtml" hash="3327dba9e03362077f7562e3045180b7"/><file name="info.phtml" hash="44ab79fdfc5fb5b0cd7e15e79bfd9502"/><file name="logging.phtml" hash="3c7bd2a6f48a84efca1d0f1e75097a8a"/><file name="note.phtml" hash="6625a3771ba10daba5ded5570574716f"/></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="d5701a0af7a8f308467fa5552d0de6b2"/><file name="help.phtml" hash="ce11f0fb8f19a00d950266840b4ec3ce"/><file name="info.phtml" hash="bd19bb1072ce1d60a4fb7bda660a0ce7"/><file name="log.phtml" hash="724a65165770bc92ed08ea32d20c1fe7"/><file name="settings.phtml" hash="56cea7faf49b815ac8bd66896130c58c"/><file name="submit.phtml" hash="0d7df80ddbd24e499275315d91fbfd58"/></dir><file name="form.phtml" hash="d2338bfe3598e9315ca8f5ac8d9b5516"/></dir><file name="status.phtml" hash="fac61e17efe7bd4cf67a47eb67786496"/><file name="view.phtml" hash="6ddfc8c6efe25d30e63f792b19a95c84"/></dir><file name="diagnostics.phtml" hash="f1f43a89824cad9f39e599df21ac44b4"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="emaildirect.xml" hash="8cb8652ad2505bb6f0c5e80d7be60109"/></dir><dir name="template"><dir name="emaildirect"><dir name="capture"><file name="email.phtml" hash="fa273ff1a48a12eb386f58f3e3e78f66"/></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="50ebf53c50e5e0419dd86a6d5faa2bf9"/></dir><file name="lists.phtml" hash="101ea6709a4355786917a6845b8d52aa"/></dir></dir><dir name="signup"><file name="form.phtml" hash="3d483079d29b79ad4daf306228120c0f"/></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>
18
  <compatible/>
19
  <dependencies/>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EmailDirect_Integration</name>
4
+ <version>2.0.16</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>Grouped product price fixes.&#xD;
12
  &#xD;
13
+ Cron troubleshooting page.</notes>
14
  <authors><author><name>Kevin Linden</name><user>auto-converted</user><email>Kevin@EmailDirect.com</email></author></authors>
15
+ <date>2015-10-06</date>
16
+ <time>03:23:27</time>
17
+ <contents><target name="magecommunity"><dir name="EmailDirect"><dir name="Integration"><dir name="Block"><dir name="Adminhtml"><dir name="Abandoned"><dir name="Details"><dir name="Tab"><dir name="Diagnostics"><file name="Status.php" hash="8706487c8f465a5ce762cd923258bb35"/></dir><file name="Cart.php" hash="09e9331f6c72157f581ad7135b7f147c"/><file name="Diagnostics.php" hash="eba18ce04ccb125ce4aa6ed5e473734a"/></dir><file name="Form.php" hash="dffc6e49eb95db2f83050706eee1fd55"/></dir><file name="Details.php" hash="9f98f4dd9ea741f9f7dd2eb018af0d7d"/><file name="Grid.php" hash="e0a15673636acb7e113fdf6e3bcd8879"/><file name="Status.php" hash="9a740fd8c63148532bbcf07d19f462df"/><file name="Tabs.php" hash="19e184e72777dfc5b0c35b7027a3e1cf"/></dir><dir name="Diagnostics"><dir name="Status"><file name="Abstract.php" hash="4a54d82d748f880fc5bb8263935ddc98"/></dir></dir><dir name="Order"><dir name="View"><dir name="Tab"><dir name="Diagnostics"><file name="Status.php" hash="b4dd8410aa9ce649e603762d5d14f314"/></dir><file name="Diagnostics.php" hash="91bb6af0c9a0e6f41d2575651e8a59ef"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="25796ead15053f86d7adcd551b8b49e7"/></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="Api.php" hash="77dabda85973dc72227937397392c411"/><file name="Common.php" hash="6a86cce53f6df6857ea79241fa281939"/><file name="Diagnostics.php" hash="7efe5c8b90db90e9c512842388d3263d"/><file name="Info.php" hash="246de52ea5d2349ecd7f103cbba8cb8f"/><file name="Logging.php" hash="53b0b7d28d2680e479bfa89b6884802d"/><file name="Mapfields.php" hash="16894c5d76df1293e63128e349700e05"/><file name="Note.php" hash="ef99a474bbc3a828c7a618132a80fe66"/><file name="Shippingmapfields.php" hash="589a74260f394a5eae1b57ca89a74a8b"/></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="Cron.php" hash="2b50d1641a4c8b630087a23b4780826a"/><file name="Download.php" hash="619916677df7c833e559aae74dae2aa0"/><file name="Help.php" hash="ad4007af59687653f4d6692f2b42b31d"/><file name="Info.php" hash="be5c15da32ef0e042c53d8ac007f8bd6"/><file name="Log.php" hash="a61e66923a287beee5910511b7282a0a"/><file name="Settings.php" hash="f15e57cdc6539c4da84042c98f0ab25c"/><file name="Submit.php" hash="81ae0e0636b66a329cf8f39939788d1d"/></dir><file name="Form.php" hash="e527a3a2335b109c48a69f06c1b0d01f"/></dir><file name="Status.php" hash="d140afcad424ff531bebb412539d6f1c"/><file name="Tabs.php" hash="5d4168cec60212beb87997e6391282e9"/><file name="View.php" hash="47efa0685db07fb73544ad477a0e2c85"/></dir><file name="Abandoned.php" hash="84e127f613dddcde2975b2a0a736aa39"/></dir><dir name="Checkout"><file name="Subscribe.php" hash="a49c1e7f612d379e6509658a56f53d7d"/></dir><dir name="Customer"><dir name="Account"><file name="Lists.php" hash="e1b911c77a78995d3b3390363926ae5a"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><dir name="Abandoned"><file name="Minutes.php" hash="01eacf162f22fef62970ec7de80ce23d"/></dir><file name="Action.php" hash="bf2243f50c9c6dafca26a5bcb889f372"/></dir></dir></dir></dir><file name="Capture.php" hash="e44034ad875957a566d3ac89abb408ed"/><file name="Signup.php" hash="c51c2e5cb93978170a65dc4b69d197bf"/></dir><dir name="Controller"><dir name="Front"><file name="Abstract.php" hash="48d93179d5f8a6b416fd82dd8763daf9"/></dir></dir><dir name="Helper"><file name="Abandoned.php" hash="7910bd8db8a030ae22adae9469d91fe7"/><file name="Data.php" hash="5a668862de9a9f5c9f87b599b63e99ad"/><file name="Diagnostic.php" hash="68867fd906405a6be98e14c1568437b6"/><file name="Fields.php" hash="5fa737c45be172f55fe965975aa6db52"/><file name="Order.php" hash="91d680ba92d44df171c7486f57cfabc7"/><file name="Troubleshooting.php" hash="cf422b72b445a86326e73cbc6f506e18"/></dir><dir name="Model"><dir name="Abandoned"><file name="Observer.php" hash="00f8e4f8186a6c800df932b74b147844"/></dir><dir name="Configuration"><file name="Observer.php" hash="9a188656d5f7d73c91bf4221cc6e4aac"/></dir><dir name="Customer"><file name="Observer.php" hash="cef8d32ba304c51b448343555ea6a066"/></dir><dir name="Mysql4"><dir name="Abandoned"><file name="Collection.php" hash="1a9129267942a98ac3830ceaf714c2ab"/></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="Newsletter"><file name="Observer.php" hash="d3181ac610e920dead78fff5656f65de"/></dir><dir name="Observer"><file name="Abstract.php" hash="1db39dc86bed51af1d2a3b4df50099bd"/></dir><dir name="Order"><file name="Observer.php" hash="17cd32f5111f0e423ac3a5d8dd62b256"/></dir><dir name="Resource"><file name="Setup.php" hash="2b4fc64eaafbd5f41f95f219871275df"/></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="b81d7f2cb03b8482debea5cd6a2bd1c5"/><file name="Additionallist.php" hash="9f109ab04c7ae7832887572b26868e3a"/><file name="Checkoutsubscribe.php" hash="fd90252a1f19649a420dae136ad2a2ba"/><file name="List.php" hash="84c1c8e27f579d5d33992fcb15202748"/><file name="Publication.php" hash="a5bc0192605fc558fe59b37cc0462825"/><file name="Sequence.php" hash="a599f218882d2cfc68dfcf4d58a98a41"/><file name="Source.php" hash="44815cbf4ac6443032df1e7d9c4cadef"/><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="e38737d197b2ccd6700ec87ec1836456"/><file name="Ftp.php" hash="d5335cfb68f99761d6902dd390a3d7a8"/><file name="Lists.php" hash="425d64b9256bbdbafa899c4138e78368"/><file name="Orders.php" hash="fa1c481787b0f994c1c1f704f73d6741"/><file name="Publications.php" hash="1bebd172a8bba669d075f09589785652"/><file name="Sources.php" hash="c6caf0274f7d0c50114324bc47a490c4"/><file name="Subscribers.php" hash="53a2c24db3936b7768ae6a8a8f98f394"/><file name="Wishlist.php" hash="2ceb111bbeaa06c4f13f61281aaa5b5e"/></dir><file name="Abandoned.php" hash="b5e001d0bc059c66ef38130b7d6dcec0"/><file name="Observer.php" hash="37a2d4c63e4ef75d535426a8670764f1"/><file name="Order.php" hash="b21426543cd46f799cd0743525120fb8"/><file name="Session.php" hash="c56ecf779dbfb2dae0030935af31911a"/></dir><dir name="controllers"><dir name="Admin"><file name="AbandonedController.php" hash="a5df99cae9322d66954111aaa8be5661"/><file name="DiagnosticController.php" hash="9dd175698b69c2bf59eee728d72726dd"/><file name="ExportController.php" hash="5bb090e4997e9c45367837c66fb9fd01"/><file name="TroubleshootingController.php" hash="02dffffc761bf1ac82ac18f51c75c976"/></dir><dir name="Customer"><file name="AccountController.php" hash="91942750c1c3d20dc31159c1ffbe8200"/></dir><file name="AbandonedController.php" hash="39c9d1a72bca9369a3121ac15f68558e"/><file name="CaptureController.php" hash="89e043bb3864617a062e915d2209dcf4"/><file name="ExportController.php" hash="7ca147debc5c1436b3bf2d9501592f33"/><file name="SignupController.php" hash="fe975d44cc11f1270d34d9d82c7d4be9"/></dir><dir name="etc"><file name="adminhtml.xml" hash="61d894b12944956c74b41f5f96956c2c"/><file name="cache.xml" hash="9f7ad708d6507ec880473689e70ef314"/><file name="config.xml" hash="5f8a95a358a0dccad2738cabb978b316"/><file name="system.xml" hash="38f8dfb41b5fcc55490daf4d7c6e147c"/></dir><dir name="sql"><dir name="emaildirect_setup"><file name="mysql4-install-2.0.0.php" hash="bdc5e09fe949b36534c50c85fd198e66"/><file name="mysql4-upgrade-1.5.8-2.0.0.php" hash="8f33c7f6dca96cfa8210ec1fe016d95b"/><file name="mysql4-upgrade-2.0.0-2.0.14.php" hash="ead09ac13bb7798b08776dda5948f91d"/></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="1b07fb2577cc46a1eaea273108a841d5"/><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="c9caf9ea168efa3b0d6f4b881bcf093c"/><file name="integration.js" hash="7980204c0f594b180b9fa336954c9229"/></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="ee6072cbc17821e860df4e0cf6ff0c90"/></dir><dir name="template"><dir name="emaildirect"><dir name="abandoned"><dir name="details"><dir name="tab"><dir name="diagnostics"><file name="status.phtml" hash="24829356b9dba966e53fb1cfe0f192b6"/></dir><file name="cart.phtml" hash="be7ca2b147fc836c2ca547b290ffe841"/></dir><file name="form.phtml" hash="60633d212382770e99d11d24ae919e47"/></dir><file name="details.phtml" hash="9d467b97a2d773aec950bea7061c6730"/><file name="status.phtml" hash="9e7723dc1fe5f8693345db9cc7cda808"/></dir><dir name="order"><dir name="view"><dir name="tab"><dir name="diagnostics"><file name="status.phtml" hash="a3bdecb1ec08903dd1b61dce6992e190"/></dir></dir></dir></dir><dir name="system"><dir name="config"><dir name="fieldset"><file name="hint.phtml" hash="176f3ddb8ea667a64a06967351526f3c"/></dir><dir name="form"><dir name="field"><dir name="export"><file name="date_range.phtml" hash="6a37b1e58456e1dcec734c48deb8c0c1"/><file name="orders.phtml" hash="1dfa19a712b18d2c95c2f4b938f6acef"/><file name="products.phtml" hash="098b7b21b6424c2a4eea26194883a623"/></dir><dir name="signup"><file name="test.phtml" hash="636501cd90c6ab4231bea54efb16b2ff"/></dir><file name="api.phtml" hash="468f33b2a23dbe2828489c1620000c74"/><file name="array.phtml" hash="5415eeff311735624354468c886d39b5"/><file name="diagnostics.phtml" hash="3327dba9e03362077f7562e3045180b7"/><file name="info.phtml" hash="44ab79fdfc5fb5b0cd7e15e79bfd9502"/><file name="logging.phtml" hash="3c7bd2a6f48a84efca1d0f1e75097a8a"/><file name="note.phtml" hash="6625a3771ba10daba5ded5570574716f"/></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="cron.phtml" hash="969e8ff6e2ee0e399ea29dd515d44a10"/><file name="download.phtml" hash="d5701a0af7a8f308467fa5552d0de6b2"/><file name="help.phtml" hash="ce11f0fb8f19a00d950266840b4ec3ce"/><file name="info.phtml" hash="bd19bb1072ce1d60a4fb7bda660a0ce7"/><file name="log.phtml" hash="724a65165770bc92ed08ea32d20c1fe7"/><file name="settings.phtml" hash="56cea7faf49b815ac8bd66896130c58c"/><file name="submit.phtml" hash="0d7df80ddbd24e499275315d91fbfd58"/></dir><file name="form.phtml" hash="d2338bfe3598e9315ca8f5ac8d9b5516"/></dir><file name="status.phtml" hash="fac61e17efe7bd4cf67a47eb67786496"/><file name="view.phtml" hash="6ddfc8c6efe25d30e63f792b19a95c84"/></dir><file name="diagnostics.phtml" hash="f1f43a89824cad9f39e599df21ac44b4"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="emaildirect.xml" hash="8cb8652ad2505bb6f0c5e80d7be60109"/></dir><dir name="template"><dir name="emaildirect"><dir name="capture"><file name="email.phtml" hash="fa273ff1a48a12eb386f58f3e3e78f66"/></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="50ebf53c50e5e0419dd86a6d5faa2bf9"/></dir><file name="lists.phtml" hash="101ea6709a4355786917a6845b8d52aa"/></dir></dir><dir name="signup"><file name="form.phtml" hash="3d483079d29b79ad4daf306228120c0f"/></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>
18
  <compatible/>
19
  <dependencies/>
20
  </package>
skin/adminhtml/default/default/emaildirect/emaildirect.css CHANGED
@@ -75,7 +75,7 @@ div.emaildirect-notice h4 div.abandoned
75
  .entry-logfile { overflow: scroll; height: 600px;}
76
 
77
  .grid .ed-config-subtable tr.headings {
78
- background: url("../images/sort_row_bg.gif") repeat-x scroll 0 50% transparent !important;
79
  }
80
 
81
  .log_note { color: red; padding: 5px 0;}
@@ -119,10 +119,10 @@ table.troubleshooting_details { margin-top: 15px; margin-bottom: 10px; }
119
  .emaildirect_help { max-width: 700px; font-size: 1.2em;}
120
 
121
  table.map_field_list, table.map_field_custom { margin-left: 20px; margin-bottom: 10px; width: 90%; }
122
- table.map_field_list tr td, table.map_field_custom tr td {width: 33%; padding: 5px;}
123
 
124
  table.map_field_custom tr td:first-child { width: 20%; }
125
- table.map_field_custom tr td:last-child { width: 80%; }
126
 
127
  .current_ip { margin-top: 10px; }
128
  .current_ip button { float: left; }
@@ -132,4 +132,7 @@ table.map_field_custom tr td:last-child { width: 80%; }
132
  .emaildirect_help h3 { margin-top: 15px; }
133
  .emaildirect_help h2 { border-bottom: solid 1px; margin-top: 15px; color: #F15628;}
134
 
135
- .sequence_example { border: solid 1px; padding: 3px; margin-bottom: 4px; width: 100px; }
 
 
 
75
  .entry-logfile { overflow: scroll; height: 600px;}
76
 
77
  .grid .ed-config-subtable tr.headings {
78
+ background: url("../images/sort_row_bg.gif") repeat-x scroll 0 50% transparent !important;
79
  }
80
 
81
  .log_note { color: red; padding: 5px 0;}
119
  .emaildirect_help { max-width: 700px; font-size: 1.2em;}
120
 
121
  table.map_field_list, table.map_field_custom { margin-left: 20px; margin-bottom: 10px; width: 90%; }
122
+ table.map_field_list tr td, table.map_field_custom tr td {width: 33%; padding: 5px;}
123
 
124
  table.map_field_custom tr td:first-child { width: 20%; }
125
+ table.map_field_custom tr td:last-child { width: 80%; }
126
 
127
  .current_ip { margin-top: 10px; }
128
  .current_ip button { float: left; }
132
  .emaildirect_help h3 { margin-top: 15px; }
133
  .emaildirect_help h2 { border-bottom: solid 1px; margin-top: 15px; color: #F15628;}
134
 
135
+ .sequence_example { border: solid 1px; padding: 3px; margin-bottom: 4px; width: 100px; }
136
+
137
+ .emaildirect_schedule_success { color: green; font-weight: bold; }
138
+ .emaildirect_schedule_failure { color: red; font-weight: bold; }