Version Notes
0.9.2 Release
Download this release
Release Info
| Developer | Kristof Ringleff |
| Extension | Fooman_EmailAttachments |
| Version | 0.11.7 |
| Comparing to | |
| See all releases | |
Code changes from version 0.11.2 to 0.11.7
- app/code/community/Fooman/EmailAttachments/Helper/Data.php +2 -2
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Compatibility.php +11 -2
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Fooman.php +5 -11
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Mandrill.php +109 -0
- app/code/community/Fooman/EmailAttachments/Model/Observer.php +3 -5
- app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/BundleItems.php +1 -0
- app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/Order.php +13 -2
- app/code/community/Fooman/EmailAttachments/Model/Selftester.php +6 -0
- app/code/community/Fooman/EmailAttachments/etc/config.xml +1 -1
- package.xml +6 -6
app/code/community/Fooman/EmailAttachments/Helper/Data.php
CHANGED
|
@@ -28,7 +28,7 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 28 |
try {
|
| 29 |
$this->debug('ADDING ATTACHMENT: ' . $name);
|
| 30 |
$file = $pdf->render();
|
| 31 |
-
if (!($mailObj instanceof Zend_Mail)) {
|
| 32 |
$mailObj = $mailObj->getMail();
|
| 33 |
}
|
| 34 |
$mailObj->createAttachment(
|
|
@@ -58,7 +58,7 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 58 |
{
|
| 59 |
try {
|
| 60 |
$this->debug('ADDING ATTACHMENT: ' . $file);
|
| 61 |
-
if (!($mailObj instanceof Zend_Mail)) {
|
| 62 |
$mailObj = $mailObj->getMail();
|
| 63 |
}
|
| 64 |
if (method_exists($mailObj, 'setType')) {
|
| 28 |
try {
|
| 29 |
$this->debug('ADDING ATTACHMENT: ' . $name);
|
| 30 |
$file = $pdf->render();
|
| 31 |
+
if (!($mailObj instanceof Zend_Mail) && !($mailObj instanceof Mandrill_Message)) {
|
| 32 |
$mailObj = $mailObj->getMail();
|
| 33 |
}
|
| 34 |
$mailObj->createAttachment(
|
| 58 |
{
|
| 59 |
try {
|
| 60 |
$this->debug('ADDING ATTACHMENT: ' . $file);
|
| 61 |
+
if (!($mailObj instanceof Zend_Mail) && !($mailObj instanceof Mandrill_Message)) {
|
| 62 |
$mailObj = $mailObj->getMail();
|
| 63 |
}
|
| 64 |
if (method_exists($mailObj, 'setType')) {
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Compatibility.php
CHANGED
|
@@ -10,6 +10,17 @@ if (Mage::helper('core')->isModuleEnabled('Aschroder_SMTPPro')
|
|
| 10 |
extends Aschroder_SMTPPro_Model_Email_Queue
|
| 11 |
{
|
| 12 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 13 |
}
|
| 14 |
} else {
|
| 15 |
class Fooman_EmailAttachments_Model_Core_Email_Queue_Compatibility
|
|
@@ -18,5 +29,3 @@ if (Mage::helper('core')->isModuleEnabled('Aschroder_SMTPPro')
|
|
| 18 |
|
| 19 |
}
|
| 20 |
}
|
| 21 |
-
|
| 22 |
-
|
| 10 |
extends Aschroder_SMTPPro_Model_Email_Queue
|
| 11 |
{
|
| 12 |
|
| 13 |
+
}
|
| 14 |
+
} elseif (Mage::helper('core')->isModuleEnabled('Ebizmarts_Mandrill')
|
| 15 |
+
&& version_compare(
|
| 16 |
+
(string)Mage::getConfig()->getNode()->modules->Ebizmarts_Mandrill->version,
|
| 17 |
+
'2.0.8', '>='
|
| 18 |
+
)
|
| 19 |
+
) {
|
| 20 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue_Compatibility
|
| 21 |
+
extends Fooman_EmailAttachments_Model_Core_Email_Queue_Mandrill
|
| 22 |
+
{
|
| 23 |
+
|
| 24 |
}
|
| 25 |
} else {
|
| 26 |
class Fooman_EmailAttachments_Model_Core_Email_Queue_Compatibility
|
| 29 |
|
| 30 |
}
|
| 31 |
}
|
|
|
|
|
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Fooman.php
CHANGED
|
@@ -77,19 +77,13 @@ class Fooman_EmailAttachments_Model_Core_Email_Queue_Fooman extends Mage_Core_Mo
|
|
| 77 |
);
|
| 78 |
//END EDIT
|
| 79 |
$mailer->send();
|
| 80 |
-
|
| 81 |
-
$message->setProcessedAt(Varien_Date::formatDate(true));
|
| 82 |
-
$message->save();
|
| 83 |
-
}
|
| 84 |
-
catch (Exception $e) {
|
| 85 |
-
unset($mailer);
|
| 86 |
-
$oldDevMode = Mage::getIsDeveloperMode();
|
| 87 |
-
Mage::setIsDeveloperMode(true);
|
| 88 |
Mage::logException($e);
|
| 89 |
-
Mage::setIsDeveloperMode($oldDevMode);
|
| 90 |
-
|
| 91 |
-
return false;
|
| 92 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
| 93 |
}
|
| 94 |
}
|
| 95 |
|
| 77 |
);
|
| 78 |
//END EDIT
|
| 79 |
$mailer->send();
|
| 80 |
+
} catch (Exception $e) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 81 |
Mage::logException($e);
|
|
|
|
|
|
|
|
|
|
| 82 |
}
|
| 83 |
+
|
| 84 |
+
unset($mailer);
|
| 85 |
+
$message->setProcessedAt(Varien_Date::formatDate(true));
|
| 86 |
+
$message->save();
|
| 87 |
}
|
| 88 |
}
|
| 89 |
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Mandrill.php
ADDED
|
@@ -0,0 +1,109 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
*
|
| 4 |
+
* @category Ebizmarts
|
| 5 |
+
* @package magemonkey1922
|
| 6 |
+
* @author Ebizmarts Team <info@ebizmarts.com>
|
| 7 |
+
* @copyright Ebizmarts (http://ebizmarts.com)
|
| 8 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 9 |
+
* @date: 2/16/16 12:46 PM
|
| 10 |
+
* @file: Queue.php
|
| 11 |
+
*/
|
| 12 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue_Mandrill extends Mage_Core_Model_Email_Queue
|
| 13 |
+
{
|
| 14 |
+
protected $_mail = null;
|
| 15 |
+
|
| 16 |
+
/**
|
| 17 |
+
* Send all messages in a queue via manrill
|
| 18 |
+
*
|
| 19 |
+
* @return Mage_Core_Model_Email_Queue
|
| 20 |
+
*/
|
| 21 |
+
public function send()
|
| 22 |
+
{
|
| 23 |
+
if (!Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::ENABLE)) {
|
| 24 |
+
return parent::send();
|
| 25 |
+
}
|
| 26 |
+
/** @var $collection Mage_Core_Model_Resource_Email_Queue_Collection */
|
| 27 |
+
$collection = Mage::getModel('core/email_queue')->getCollection()
|
| 28 |
+
->addOnlyForSendingFilter()
|
| 29 |
+
->setPageSize(self::MESSAGES_LIMIT_PER_CRON_RUN)
|
| 30 |
+
->setCurPage(1)
|
| 31 |
+
->load();
|
| 32 |
+
/** @var $message Mage_Core_Model_Email_Queue */
|
| 33 |
+
foreach ($collection as $message) {
|
| 34 |
+
if ($message->getId()) {
|
| 35 |
+
$this->_mail = null;
|
| 36 |
+
$parameters = new Varien_Object($message->getMessageParameters());
|
| 37 |
+
$mailer = $this->getMail();
|
| 38 |
+
|
| 39 |
+
Mage::dispatchEvent(
|
| 40 |
+
'fooman_emailattachments_before_send_queue',
|
| 41 |
+
array(
|
| 42 |
+
'mailer' => $mailer,
|
| 43 |
+
'message' => $message,
|
| 44 |
+
'mail_transport' => false
|
| 45 |
+
|
| 46 |
+
)
|
| 47 |
+
);
|
| 48 |
+
|
| 49 |
+
$mandrill = array(
|
| 50 |
+
'subject' => $parameters->getSubject(),
|
| 51 |
+
'to' => array(),
|
| 52 |
+
'from_email' => $parameters->getFromEmail(),
|
| 53 |
+
'from_name' => $parameters->getFromName(),
|
| 54 |
+
'headers' => $mailer->getHeaders(),
|
| 55 |
+
'html' => ($parameters->getIsPlain() ? "" : $message->getMessageBody()),
|
| 56 |
+
'text' => ($parameters->getIsPlain() ? $message->getMessageBody() : ""),
|
| 57 |
+
);
|
| 58 |
+
|
| 59 |
+
if ($att = $mailer->getAttachments()) {
|
| 60 |
+
$mandrill['attachments'] = $att;
|
| 61 |
+
}
|
| 62 |
+
foreach ($message->getRecipients() as $recipient) {
|
| 63 |
+
list($email, $name, $type) = $recipient;
|
| 64 |
+
$mandrill['to'][] = array(
|
| 65 |
+
'type' => ($type == self::EMAIL_TYPE_BCC ? "bcc" : "to"),
|
| 66 |
+
'email' => $email,
|
| 67 |
+
'name' => $name
|
| 68 |
+
);
|
| 69 |
+
}
|
| 70 |
+
if ($parameters->getReplyTo() !== null) {
|
| 71 |
+
$mandrill['headers'] = array_merge($mandrill['headers'], array('Reply-To' => $parameters->getReplyTo()));
|
| 72 |
+
}
|
| 73 |
+
if ($parameters->getReturnTo() !== null) {
|
| 74 |
+
$mailer->setReturnPath($parameters->getReturnTo());
|
| 75 |
+
}
|
| 76 |
+
|
| 77 |
+
|
| 78 |
+
try {
|
| 79 |
+
$mailer->messages->send($mandrill);
|
| 80 |
+
} catch (Exception $e) {
|
| 81 |
+
Mage::logException($e);
|
| 82 |
+
}
|
| 83 |
+
unset($mailer);
|
| 84 |
+
unset($mandrill);
|
| 85 |
+
$message->setProcessedAt(Varien_Date::formatDate(true));
|
| 86 |
+
$message->save();
|
| 87 |
+
}
|
| 88 |
+
}
|
| 89 |
+
return $this;
|
| 90 |
+
}
|
| 91 |
+
/**
|
| 92 |
+
* @return Mandrill_Message|Zend_Mail
|
| 93 |
+
*/
|
| 94 |
+
public function getMail()
|
| 95 |
+
{
|
| 96 |
+
$storeId = Mage::app()->getStore()->getId();
|
| 97 |
+
if (!Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::ENABLE, $storeId)) {
|
| 98 |
+
return parent::getMail();
|
| 99 |
+
}
|
| 100 |
+
if ($this->_mail) {
|
| 101 |
+
return $this->_mail;
|
| 102 |
+
} else {
|
| 103 |
+
$storeId = Mage::app()->getStore()->getId();
|
| 104 |
+
Mage::helper('ebizmarts_mandrill')->log("store: $storeId API: " . Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
|
| 105 |
+
$this->_mail = new Mandrill_Message(Mage::getStoreConfig(Ebizmarts_Mandrill_Model_System_Config::APIKEY, $storeId));
|
| 106 |
+
return $this->_mail;
|
| 107 |
+
}
|
| 108 |
+
}
|
| 109 |
+
}
|
app/code/community/Fooman/EmailAttachments/Model/Observer.php
CHANGED
|
@@ -121,10 +121,10 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 121 |
if ($emails && Mage::getStoreConfig('sales_email/' . $configPath . '/sendpackingslip', $storeId)) {
|
| 122 |
$template = Mage::getStoreConfig(self::XML_PATH_ORDER_PACKINGSLIP_TEMPLATE, $storeId);
|
| 123 |
$pdf = Mage::getModel('sales/order_pdf_shipment')->getPdf(array(), array($order->getId()));
|
| 124 |
-
Mage::helper('emailattachments')->addAttachment(
|
| 125 |
-
$pdf, $mailTemplate, Mage::helper('sales')->__('Shipment') . "_" . $order->getIncrementId()
|
| 126 |
-
);
|
| 127 |
foreach ($emails as $email) {
|
|
|
|
|
|
|
|
|
|
| 128 |
$mailTemplate->setDesignConfig(array('area' => 'frontend', 'store' => $storeId))
|
| 129 |
->sendTransactional(
|
| 130 |
$template,
|
|
@@ -137,8 +137,6 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 137 |
);
|
| 138 |
}
|
| 139 |
}
|
| 140 |
-
|
| 141 |
-
|
| 142 |
}
|
| 143 |
|
| 144 |
/**
|
| 121 |
if ($emails && Mage::getStoreConfig('sales_email/' . $configPath . '/sendpackingslip', $storeId)) {
|
| 122 |
$template = Mage::getStoreConfig(self::XML_PATH_ORDER_PACKINGSLIP_TEMPLATE, $storeId);
|
| 123 |
$pdf = Mage::getModel('sales/order_pdf_shipment')->getPdf(array(), array($order->getId()));
|
|
|
|
|
|
|
|
|
|
| 124 |
foreach ($emails as $email) {
|
| 125 |
+
Mage::helper('emailattachments')->addAttachment(
|
| 126 |
+
$pdf, $mailTemplate, Mage::helper('sales')->__('Shipment') . "_" . $order->getIncrementId()
|
| 127 |
+
);
|
| 128 |
$mailTemplate->setDesignConfig(array('area' => 'frontend', 'store' => $storeId))
|
| 129 |
->sendTransactional(
|
| 130 |
$template,
|
| 137 |
);
|
| 138 |
}
|
| 139 |
}
|
|
|
|
|
|
|
| 140 |
}
|
| 141 |
|
| 142 |
/**
|
app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/BundleItems.php
CHANGED
|
@@ -29,6 +29,7 @@ class Fooman_EmailAttachments_Model_Order_Pdf_BundleItems extends Mage_Bundle_Mo
|
|
| 29 |
if ($_items) {
|
| 30 |
foreach ($_items as $_item) {
|
| 31 |
$parentItem = $_item->getParentItem();
|
|
|
|
| 32 |
$_item->setOrderItem($_item);
|
| 33 |
if ($parentItem) {
|
| 34 |
$_itemsArray[$parentItem->getId()][$_item->getId()] = $_item;
|
| 29 |
if ($_items) {
|
| 30 |
foreach ($_items as $_item) {
|
| 31 |
$parentItem = $_item->getParentItem();
|
| 32 |
+
$_item->setQty($_item->getQtyOrdered());
|
| 33 |
$_item->setOrderItem($_item);
|
| 34 |
if ($parentItem) {
|
| 35 |
$_itemsArray[$parentItem->getId()][$_item->getId()] = $_item;
|
app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/Order.php
CHANGED
|
@@ -22,6 +22,8 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 22 |
*/
|
| 23 |
public function getPdf($orders = array())
|
| 24 |
{
|
|
|
|
|
|
|
| 25 |
$this->_beforeGetPdf();
|
| 26 |
$this->_initRenderer('order');
|
| 27 |
|
|
@@ -41,6 +43,9 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 41 |
Mage::app()->getLocale()->emulate($order->getStoreId());
|
| 42 |
Mage::app()->setCurrentStore($order->getStoreId());
|
| 43 |
}
|
|
|
|
|
|
|
|
|
|
| 44 |
$page = $pdf->newPage(Zend_Pdf_Page::SIZE_A4);
|
| 45 |
$pdf->pages[] = $page;
|
| 46 |
|
|
@@ -61,7 +66,7 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 61 |
|
| 62 |
$page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
|
| 63 |
|
| 64 |
-
$this->_printItems($order, $page);
|
| 65 |
|
| 66 |
/* Add totals */
|
| 67 |
$order->setOrder($order);
|
|
@@ -76,6 +81,8 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 76 |
$this->_afterGetPdf();
|
| 77 |
Mage::app()->setCurrentStore($currentStoreId);
|
| 78 |
|
|
|
|
|
|
|
| 79 |
return $pdf;
|
| 80 |
}
|
| 81 |
|
|
@@ -97,6 +104,8 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 97 |
$item->setOrderItem($item);
|
| 98 |
$page = $this->_drawItem($item, $page, $order);
|
| 99 |
}
|
|
|
|
|
|
|
| 100 |
}
|
| 101 |
|
| 102 |
protected function _printComments($order, Zend_Pdf_Page $page)
|
|
@@ -117,10 +126,12 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 117 |
$leftToPrint = array();
|
| 118 |
while ($this->widthForStringUsingFontSize(
|
| 119 |
implode(' ', $currentLine), $page->getFont(), $page->getFontSize()
|
| 120 |
-
) > $availableWidth) {
|
| 121 |
$leftToPrint[] = array_pop($currentLine);
|
| 122 |
}
|
|
|
|
| 123 |
$page->drawText(implode(' ', $currentLine), 35, $this->y, 'UTF-8');
|
|
|
|
| 124 |
}
|
| 125 |
}
|
| 126 |
}
|
| 22 |
*/
|
| 23 |
public function getPdf($orders = array())
|
| 24 |
{
|
| 25 |
+
$currentDesignArea = Mage::getDesign()->getArea();
|
| 26 |
+
|
| 27 |
$this->_beforeGetPdf();
|
| 28 |
$this->_initRenderer('order');
|
| 29 |
|
| 43 |
Mage::app()->getLocale()->emulate($order->getStoreId());
|
| 44 |
Mage::app()->setCurrentStore($order->getStoreId());
|
| 45 |
}
|
| 46 |
+
|
| 47 |
+
Mage::getDesign()->setArea(Mage_Core_Model_App_Area::AREA_ADMINHTML);
|
| 48 |
+
|
| 49 |
$page = $pdf->newPage(Zend_Pdf_Page::SIZE_A4);
|
| 50 |
$pdf->pages[] = $page;
|
| 51 |
|
| 66 |
|
| 67 |
$page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
|
| 68 |
|
| 69 |
+
$page = $this->_printItems($order, $page);
|
| 70 |
|
| 71 |
/* Add totals */
|
| 72 |
$order->setOrder($order);
|
| 81 |
$this->_afterGetPdf();
|
| 82 |
Mage::app()->setCurrentStore($currentStoreId);
|
| 83 |
|
| 84 |
+
Mage::getDesign()->setArea($currentDesignArea);
|
| 85 |
+
|
| 86 |
return $pdf;
|
| 87 |
}
|
| 88 |
|
| 104 |
$item->setOrderItem($item);
|
| 105 |
$page = $this->_drawItem($item, $page, $order);
|
| 106 |
}
|
| 107 |
+
|
| 108 |
+
return $page;
|
| 109 |
}
|
| 110 |
|
| 111 |
protected function _printComments($order, Zend_Pdf_Page $page)
|
| 126 |
$leftToPrint = array();
|
| 127 |
while ($this->widthForStringUsingFontSize(
|
| 128 |
implode(' ', $currentLine), $page->getFont(), $page->getFontSize()
|
| 129 |
+
) > $availableWidth - 60) {
|
| 130 |
$leftToPrint[] = array_pop($currentLine);
|
| 131 |
}
|
| 132 |
+
$leftToPrint = array_reverse($leftToPrint);
|
| 133 |
$page->drawText(implode(' ', $currentLine), 35, $this->y, 'UTF-8');
|
| 134 |
+
$this->y -= 15;
|
| 135 |
}
|
| 136 |
}
|
| 137 |
}
|
app/code/community/Fooman/EmailAttachments/Model/Selftester.php
CHANGED
|
@@ -38,6 +38,11 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 38 |
return $rewrites;
|
| 39 |
}
|
| 40 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 41 |
/**
|
| 42 |
* list of extension files
|
| 43 |
*
|
|
@@ -58,6 +63,7 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 58 |
'app/code/community/Fooman/EmailAttachments/Model/Core/App/Emulation.php',
|
| 59 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Template/Mailer.php',
|
| 60 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php',
|
|
|
|
| 61 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Compatibility.php',
|
| 62 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Fooman.php',
|
| 63 |
'app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/BundleItems.php',
|
| 38 |
return $rewrites;
|
| 39 |
}
|
| 40 |
|
| 41 |
+
public function _checkMalformedFiles()
|
| 42 |
+
{
|
| 43 |
+
return true;
|
| 44 |
+
}
|
| 45 |
+
|
| 46 |
/**
|
| 47 |
* list of extension files
|
| 48 |
*
|
| 63 |
'app/code/community/Fooman/EmailAttachments/Model/Core/App/Emulation.php',
|
| 64 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Template/Mailer.php',
|
| 65 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php',
|
| 66 |
+
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Mandrill.php',
|
| 67 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Compatibility.php',
|
| 68 |
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Fooman.php',
|
| 69 |
'app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/BundleItems.php',
|
app/code/community/Fooman/EmailAttachments/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Fooman_EmailAttachments>
|
| 5 |
-
<version>0.11.
|
| 6 |
<depends>
|
| 7 |
</depends>
|
| 8 |
</Fooman_EmailAttachments>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Fooman_EmailAttachments>
|
| 5 |
+
<version>0.11.7</version>
|
| 6 |
<depends>
|
| 7 |
</depends>
|
| 8 |
</Fooman_EmailAttachments>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fooman_EmailAttachments</name>
|
| 4 |
-
<version>0.11.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -16,10 +16,10 @@
|
|
| 16 |
Attaches html and text files for terms and conditions
|
| 17 |
Fine grained options offer complete control over what to attach to which email</description>
|
| 18 |
<notes>0.9.2 Release</notes>
|
| 19 |
-
<authors><author><name>Kristof Ringleff</name><user>
|
| 20 |
-
<date>
|
| 21 |
-
<time>
|
| 22 |
-
<contents><target name="magecommunity"><dir name="Fooman"><dir name="EmailAttachments"><dir name="Block"><dir name="Adminhtml"><file name="Extensioninfo.php" hash="b71b6d6e6c11254588100f0f5b6b9c10"/></dir></dir><dir name="Helper"><file name="Data.php" hash="
|
| 23 |
<compatible/>
|
| 24 |
-
<dependencies><required><package><name>Fooman_Common</name><channel>community</channel><min
|
| 25 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fooman_EmailAttachments</name>
|
| 4 |
+
<version>0.11.7</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 16 |
Attaches html and text files for terms and conditions
|
| 17 |
Fine grained options offer complete control over what to attach to which email</description>
|
| 18 |
<notes>0.9.2 Release</notes>
|
| 19 |
+
<authors><author><name>Kristof Ringleff</name><user>FOOMAN</user><email>kristof@fooman.co.nz</email></author><author><name>Kristof Ringleff</name><user>FOOMAN</user><email>kristof@fooman.co.nz</email></author></authors>
|
| 20 |
+
<date>2016-11-16</date>
|
| 21 |
+
<time>07:54:52</time>
|
| 22 |
+
<contents><target name="magecommunity"><dir name="Fooman"><dir name="EmailAttachments"><dir name="Block"><dir name="Adminhtml"><file name="Extensioninfo.php" hash="b71b6d6e6c11254588100f0f5b6b9c10"/></dir></dir><dir name="Helper"><file name="Data.php" hash="893165161523a0fe8acb6a9c01da5a25"/></dir><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><dir name="Model"><dir name="Core"><dir name="App"><file name="Emulation.php" hash="6b0db295ff798b3286e8fbfcc061dbba"/></dir><dir name="Email"><dir name="Queue"><file name="Compatibility.php" hash="afb71db358a3d931856a29fe0cb97831"/><file name="Fooman.php" hash="4ad182c0ec755284118421f04fa2c7c1"/><file name="Mandrill.php" hash="dfa497923474c3f8d55e19290cd99d41"/></dir><file name="Queue.php" hash="df640a479bf40bc71cdcc7b824631138"/><dir name="Template"><file name="Mailer.php" hash="caf26b4981bb2588ea9c80f789ea327c"/></dir></dir></dir><file name="Observer.php" hash="7f312795d36bc96f126b73eb7693d6a9"/><dir name="Order"><dir name="Pdf"><file name="BundleItems.php" hash="2482480a769292844e6b553f557df5eb"/><file name="Order.php" hash="03275554d54429eab92e1d7e40fe3e70"/></dir></dir><file name="Selftester.php" hash="2f46da7a02315df91f972b1593bb01ef"/><dir name="System"><file name="File.php" hash="70b05b8e860088b0d2769d7a79c38e0c"/></dir></dir><dir name="controllers"><dir name="Admin"><file name="OrderController.php" hash="e6b7c1937dd4f41fe376c799b2b80fdf"/></dir><dir name="Adminhtml"><dir name="EmailAttachments"><file name="OrderController.php" hash="6f89a68629bc13b144cdc02ff8837005"/></dir></dir><dir name="Customer"><file name="OrderController.php" hash="bc8d1ae57801fcdf5bc1d5abbac0b879"/></dir></dir><dir name="etc"><file name="config.xml" hash="36b0907198c17bb1476ef4a081b49cbe"/><file name="system.xml" hash="ce767d4fea83b6d0c4d447e035ec0f5c"/></dir><file name="modman" hash="9f838aa064e82521f44aa0c12cfaac0c"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fooman_EmailAttachments.xml" hash="041c20e1806af133c1c1505af9902001"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Fooman_EmailAttachments.csv" hash="572cca36b6b4a051b7722cb6488a636a"/><dir name="template"><dir name="email"><dir name="sales"><file name="order_new_packingslip.html" hash="298c5ed126d7f2e28d731f621b7c82e0"/></dir></dir></dir></dir><dir name="de_DE"><file name="Fooman_EmailAttachments.csv" hash="7113fa7ee43f7daeb5511123d014ed57"/></dir><dir name="nl_NL"><file name="Fooman_EmailAttachments.csv" hash="379a96bf751644c476f9ba770736fbe2"/></dir><dir name="fr_FR"><file name="Fooman_EmailAttachments.csv" hash="9a1527774e75286333932659b90da09d"/></dir><dir name="es_ES"><file name="Fooman_EmailAttachments.csv" hash="1b9628695c1c2295b915bd1c06edcb84"/></dir><dir name="ro_RO"><file name="Fooman_EmailAttachments.csv" hash="2a24c0da13bfafb658325b6bf4c44f1d"/></dir><dir name="th_TH"><file name="Fooman_EmailAttachments.csv" hash="572cca36b6b4a051b7722cb6488a636a"/></dir><dir name="da_DK"><file name="Fooman_EmailAttachments.csv" hash="129927e87ec7d8b3d4466a58e5215b09"/></dir><dir name="ar_SA"><file name="Fooman_EmailAttachments.csv" hash="00b09a522a8edfb796a0668ef4faedc4"/></dir><dir name="ca_ES"><file name="Fooman_EmailAttachments.csv" hash="a81b65ca792f534072511a18a91423c9"/></dir><dir name="cs_CZ"><file name="Fooman_EmailAttachments.csv" hash="86f4cac9569ca2708b44a5240496d00a"/></dir><dir name="et_EE"><file name="Fooman_EmailAttachments.csv" hash="206f6d731c2e2ef3664869a6be68b95f"/></dir><dir name="he_IL"><file name="Fooman_EmailAttachments.csv" hash="81b7326525ee4839e41be971709f9e96"/></dir><dir name="it_IT"><file name="Fooman_EmailAttachments.csv" hash="d5a0dd8ea51c030c33efdb5159f3c549"/></dir><dir name="ja_JP"><file name="Fooman_EmailAttachments.csv" hash="5618c215a5cbb924d2951c879d42573f"/></dir><dir name="lt_LT"><file name="Fooman_EmailAttachments.csv" hash="18fff03b09d88b8b938bed19639b4f8f"/></dir><dir name="lv_LV"><file name="Fooman_EmailAttachments.csv" hash="15714286f2b7e009f7674a9f747a1cd4"/></dir><dir name="no_NO"><file name="Fooman_EmailAttachments.csv" hash="9d201c51cfc24326a0a677b2f7cd838e"/></dir><dir name="pt_BR"><file name="Fooman_EmailAttachments.csv" hash="463ca55f2f52b4422ff2f275f8649b85"/></dir><dir name="sl_SI"><file name="Fooman_EmailAttachments.csv" hash="288a189ee828dc6b91b72f20bc771452"/></dir><dir name="sv_SE"><file name="Fooman_EmailAttachments.csv" hash="d9a51a4c763d9cb0739d57a4f1d9c18c"/></dir><dir name="fi_FI"><file name="Fooman_EmailAttachments.csv" hash="53f5fa6e60fb26effdd36422d8bf24f9"/></dir><dir name="gr_GR"><file name="Fooman_EmailAttachments.csv" hash="22959ba9d6c58a89db59db26edf9b163"/></dir><dir name="hr_HR"><file name="Fooman_EmailAttachments.csv" hash="6564938bfeefdc2ca37f183943bc5873"/></dir><dir name="ko_KR"><file name="Fooman_EmailAttachments.csv" hash="951a785b40eb519b6f460fccc7718b24"/></dir><dir name="nb_NO"><file name="Fooman_EmailAttachments.csv" hash="9d201c51cfc24326a0a677b2f7cd838e"/></dir><dir name="pl_PL"><file name="Fooman_EmailAttachments.csv" hash="db51bd721228cf6f3b8f25702282cced"/></dir><dir name="ru_RU"><file name="Fooman_EmailAttachments.csv" hash="5c111bca22d66855aa3f999a74b1fdba"/></dir><dir name="zh_CN"><file name="Fooman_EmailAttachments.csv" hash="f35148d8703229c2945565b3d8559455"/></dir><dir name="fa_IR"><file name="Fooman_EmailAttachments.csv" hash="02f8af4fe42307f3a0ef12d897c64f47"/></dir><dir name="sk_SK"><file name="Fooman_EmailAttachments.csv" hash="86c42277437d0f293754892581f523ed"/></dir><dir name="hu_HU"><file name="Fooman_EmailAttachments.csv" hash="4136ac55aebaff443434d80612bd6371"/></dir><dir name="tr_TR"><file name="Fooman_EmailAttachments.csv" hash="5558cec8fd8faf7bb4333bfc75a5bc6c"/></dir></target></contents>
|
| 23 |
<compatible/>
|
| 24 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Fooman_Common</name><channel>magento-community</channel><min/><max/></package></required></dependencies>
|
| 25 |
</package>
|
