diff --git a/app/code/community/FreeLunchLabs/MailGun/Block/Adminhtml/Event/Renderer/Timestamp.php b/app/code/community/FreeLunchLabs/MailGun/Block/Adminhtml/Event/Renderer/Timestamp.php
index 6e46333173b7956925b7dbd116f2b89e1a8e0641..718297d30edcebed2e1e7688bdb44fdfbb38b53d 100644
--- a/app/code/community/FreeLunchLabs/MailGun/Block/Adminhtml/Event/Renderer/Timestamp.php
+++ b/app/code/community/FreeLunchLabs/MailGun/Block/Adminhtml/Event/Renderer/Timestamp.php
@@ -4,7 +4,7 @@ class FreeLunchLabs_MailGun_Block_Adminhtml_Event_Renderer_Timestamp extends Mag
public function render(Varien_Object $row)
{
$value = $row->getData($this->getColumn()->getIndex());
- $date = Mage::getSingleton('core/date')->date(null, $value);
+ $date = Mage::getSingleton('core/date')->timestamp($value);
return Mage::helper('core')->formatDate(new Zend_Date($date), 'medium', true);
}
}
\ No newline at end of file
diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php b/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php
index 81a8d93cdffbd060c42650b4a1fa3dc69c66cef0..dd85e36f4a8ee3222d4126fc43f136db04de2368 100644
--- a/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php
+++ b/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php
@@ -75,7 +75,7 @@ class FreeLunchLabs_MailGun_Model_Mailgun extends Mage_Core_Model_Abstract {
if($store->getConfig('mailgun/events/store')) {
$this->processEmailEventsForSingleStore($store);
}
- }
+ }
}
public function processEmailEventsForSingleStore(Mage_Core_Model_Store $store) {
@@ -88,9 +88,9 @@ class FreeLunchLabs_MailGun_Model_Mailgun extends Mage_Core_Model_Abstract {
);
$mailgunEvents = $this->mailgunRequest(
- 'events',
- $store->getConfig('mailgun/general/domain'),
- $store->getConfig('mailgun/general/key'),
+ 'events',
+ $store->getConfig('mailgun/general/domain'),
+ $store->getConfig('mailgun/general/key'),
$data
);
@@ -98,12 +98,12 @@ class FreeLunchLabs_MailGun_Model_Mailgun extends Mage_Core_Model_Abstract {
while (sizeof($mailgunEvents->items) > 0) {
$mailgunEvents = $this->mailgunRequest(
- 'events',
- $store->getConfig('mailgun/general/domain'),
- $store->getConfig('mailgun/general/key'),
+ 'events',
+ $store->getConfig('mailgun/general/domain'),
+ $store->getConfig('mailgun/general/key'),
$data,
Zend_Http_Client::GET,
- $mailgunEvents->paging->next
+ $mailgunEvents->paging->next
);
$events = array_merge($events, $mailgunEvents->items);
diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Messagebuilder.php b/app/code/community/FreeLunchLabs/MailGun/Model/Messagebuilder.php
index 6eb4de27b7f422d4fb2ee316de91a229fa96aa11..a3294f225bd962467eb4001a94cf94a7d10cd422 100644
--- a/app/code/community/FreeLunchLabs/MailGun/Model/Messagebuilder.php
+++ b/app/code/community/FreeLunchLabs/MailGun/Model/Messagebuilder.php
@@ -148,7 +148,7 @@ class FreeLunchLabs_MailGun_Model_Messagebuilder extends Varien_Object {
}
public function getHtmlBody() {
- return $this->message['html'];
+ return isset($this->message['html']) ? $this->message['html'] : " ";
}
public function addAttachment($filename, $data) {
diff --git a/app/code/community/FreeLunchLabs/MailGun/etc/config.xml b/app/code/community/FreeLunchLabs/MailGun/etc/config.xml
index f1a7ad763c241da673dfd5ec4c0250c8b24175da..96496b0ee41dfc7fa791dc9ec36a9c124078e71a 100644
--- a/app/code/community/FreeLunchLabs/MailGun/etc/config.xml
+++ b/app/code/community/FreeLunchLabs/MailGun/etc/config.xml
@@ -2,7 +2,7 @@
<config>
<modules>
<FreeLunchLabs_MailGun>
- <version>1.0.1</version>
+ <version>1.0.2</version>
</FreeLunchLabs_MailGun>
</modules>
<global>
@@ -74,11 +74,11 @@
<menu>
<customer>
<children>
- <cloudfront translate="title" module="mailgun">
+ <emailtracking translate="title" module="mailgun">
<title>Email Tracking</title>
<sort_order>9999</sort_order>
<action>adminhtml/emailtracking</action>
- </cloudfront>
+ </emailtracking>
</children>
</customer>
</menu>
@@ -86,6 +86,14 @@
<resources>
<admin>
<children>
+ <customer>
+ <children>
+ <emailtracking translate="title" module="mailgun">
+ <title>Email Tracking</title>
+ <sort_order>70</sort_order>
+ </emailtracking>
+ </children>
+ </customer>
<system>
<children>
<config>
@@ -148,4 +156,4 @@
</freelunchlabs_processevents>
</jobs>
</crontab>
-</config>
\ No newline at end of file
+</config>
diff --git a/app/code/community/FreeLunchLabs/MailGun/sql/mailgun_setup/mysql4-upgrade-1.0.0-1.0.1.php b/app/code/community/FreeLunchLabs/MailGun/sql/mailgun_setup/mysql4-upgrade-1.0.0-1.0.1.php
new file mode 100644
index 0000000000000000000000000000000000000000..9bd293da35b4a5779d86b295911c34b5cfeeab1a
--- /dev/null
+++ b/app/code/community/FreeLunchLabs/MailGun/sql/mailgun_setup/mysql4-upgrade-1.0.0-1.0.1.php
@@ -0,0 +1,9 @@
+<?php
+
+$installer = $this;
+
+$installer->startSetup();
+
+// do nothing!
+
+$installer->endSetup();
diff --git a/app/code/community/FreeLunchLabs/MailGun/sql/mailgun_setup/mysql4-upgrade-1.0.1-1.0.2.php b/app/code/community/FreeLunchLabs/MailGun/sql/mailgun_setup/mysql4-upgrade-1.0.1-1.0.2.php
new file mode 100644
index 0000000000000000000000000000000000000000..182360a2f614a89c88b1ae954777dae05c334bc5
--- /dev/null
+++ b/app/code/community/FreeLunchLabs/MailGun/sql/mailgun_setup/mysql4-upgrade-1.0.1-1.0.2.php
@@ -0,0 +1,23 @@
+<?php
+
+$installer = $this;
+
+$installer->startSetup();
+
+$installer->run("
+
+ALTER TABLE {$this->getTable('freelunchlabs_mailgun/event')}
+ CHANGE `timestamp` `timestamp_old` varchar(255);
+
+ALTER TABLE {$this->getTable('freelunchlabs_mailgun/event')}
+ ADD COLUMN `timestamp` timestamp;
+
+UPDATE {$this->getTable('freelunchlabs_mailgun/event')}
+ SET `timestamp`=from_unixtime(`timestamp_old`+(((timediff(now(),convert_tz(now(),@@session.time_zone,'+00:00'))*-1)/10000)*60*60));
+
+ALTER TABLE {$this->getTable('freelunchlabs_mailgun/event')}
+ DROP COLUMN `timestamp_old`;
+
+");
+
+$installer->endSetup();