diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Email.php b/app/code/community/FreeLunchLabs/MailGun/Model/Email.php index dca8b6a8057811c43bd50b08674b7612639831c3..45d8ea581d5ecef0a6b8609fd1d8d471ea3688be 100644 --- a/app/code/community/FreeLunchLabs/MailGun/Model/Email.php +++ b/app/code/community/FreeLunchLabs/MailGun/Model/Email.php @@ -7,6 +7,7 @@ class FreeLunchLabs_MailGun_Model_Email extends Mage_Core_Model_Abstract { } public function saveInitialSend($message, $sendResponse) { + /** @var Mage_Customer_Model_Customer $customer */ $customer = Mage::getModel('customer/customer'); $customer->setWebsiteId($message->getStore()->getWebsite()->getId()); $customer->loadByEmail($message->getPrimaryRecipient()); @@ -19,7 +20,7 @@ class FreeLunchLabs_MailGun_Model_Email extends Mage_Core_Model_Abstract { $this->setMailgunId(str_replace(array("<", ">"), "", $sendResponse->id)); $this->setSubject($message->getSubject()); $this->setBody($message->getHtmlBody()); - $this->setDateSent(Mage::getSingleton('core/date')->gmtTimestamp()); + $this->setDateSent(date("Y-m-d H:i:s", Mage::getSingleton('core/date')->gmtTimestamp())); $this->save(); Mage::getModel('freelunchlabs_mailgun/event')->logEmailEvent($this->getId(), FreeLunchLabs_MailGun_Model_Event::GENERATED, $this); diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Event.php b/app/code/community/FreeLunchLabs/MailGun/Model/Event.php index 80fc8cf188fcde6fe1b16cac2651e21dbb107b0d..20676af499976ddbe32aad470a93dc83f8f2be75 100644 --- a/app/code/community/FreeLunchLabs/MailGun/Model/Event.php +++ b/app/code/community/FreeLunchLabs/MailGun/Model/Event.php @@ -21,7 +21,7 @@ class FreeLunchLabs_MailGun_Model_Event extends Mage_Core_Model_Abstract { public function logEmailEvent($emailId, $eventType, $email = false) { $this->setEmailId($emailId); $this->setEventType($eventType); - $this->setTimestamp(Mage::getSingleton('core/date')->gmtTimestamp()); + $this->setTimestamp(date("Y-m-d H:i:s", Mage::getSingleton('core/date')->gmtTimestamp())); $this->save(); } diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php b/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php index dd85e36f4a8ee3222d4126fc43f136db04de2368..c7a2845ededd51bdad9820765624f0fc2d588c2a 100644 --- a/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php +++ b/app/code/community/FreeLunchLabs/MailGun/Model/Mailgun.php @@ -118,12 +118,13 @@ class FreeLunchLabs_MailGun_Model_Mailgun extends Mage_Core_Model_Abstract { $email = Mage::getModel('freelunchlabs_mailgun/email')->loadByMailgunIdAndRecipient($mailgunEvent->message->headers->{'message-id'}, $mailgunEvent->recipient); if($email->getId()) { - $event = Mage::getModel('freelunchlabs_mailgun/event')->loadByTimestampAndEmailId($mailgunEvent->timestamp, $email->getId()); + $timestamp = date("Y-m-d H:i:s", $mailgunEvent->timestamp); + $event = Mage::getModel('freelunchlabs_mailgun/event')->loadByTimestampAndEmailId($timestamp, $email->getId()); if(!$event->getId()) { $event->setEmailId($email->getId()); $event->setEventType($mailgunEvent->event); - $event->setTimestamp($mailgunEvent->timestamp); + $event->setTimestamp($timestamp); $event->save(); } } diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V1.php b/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V1.php index 1de4748b4edd75cea397e12a94fed35d1268fd1b..d032bacbe2c62409971e77bfcc0601c669624b18 100644 --- a/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V1.php +++ b/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V1.php @@ -8,7 +8,7 @@ class FreeLunchLabs_MailGun_Model_Resource_Email_V1 extends Mage_Core_Model_Reso public function deleteEmailTrackingLogs($days = false) { if ($days) { - $daysPrior = date("Y-m-d H:i:s", Mage::getModel('core/date')->timestamp(time() - (86400 * $days))); + $daysPrior = date("Y-m-d H:i:s", Mage::getModel('core/date')->gmtTimestamp(time() - (86400 * $days))); $where = " WHERE date_sent < '{$daysPrior}'"; } else { $where = ""; diff --git a/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V2.php b/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V2.php index 2ff4c0656683e92aedd4725d789ba1985251a903..675bdd61805bc30f41d369a72168c37cc8c7e44d 100644 --- a/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V2.php +++ b/app/code/community/FreeLunchLabs/MailGun/Model/Resource/Email/V2.php @@ -8,7 +8,7 @@ class FreeLunchLabs_MailGun_Model_Resource_Email_V2 extends Mage_Core_Model_Mysq public function deleteEmailTrackingLogs($days = false) { if ($days) { - $daysPrior = date("Y-m-d H:i:s", Mage::getModel('core/date')->timestamp(time() - (86400 * $days))); + $daysPrior = date("Y-m-d H:i:s", Mage::getModel('core/date')->gmtTimestamp(time() - (86400 * $days))); $where = " WHERE date_sent < '{$daysPrior}'"; } else { $where = "";