Version Notes
0.9.2 Release
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Fooman_EmailAttachments |
| Version | 0.10.2 |
| Comparing to | |
| See all releases | |
Code changes from version 0.9.13 to 0.10.2
- app/code/community/Fooman/EmailAttachments/Helper/Data.php +28 -12
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php +97 -0
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Template/Mailer.php +2 -0
- app/code/community/Fooman/EmailAttachments/Model/Observer.php +36 -1
- app/code/community/Fooman/EmailAttachments/Model/Selftester.php +49 -41
- app/code/community/Fooman/EmailAttachments/etc/config.xml +11 -1
- app/code/community/Fooman/EmailAttachments/modman +1 -0
- app/locale/gr_GR/Fooman_EmailAttachments.csv +2 -2
- package.xml +4 -4
app/code/community/Fooman/EmailAttachments/Helper/Data.php
CHANGED
|
@@ -28,7 +28,10 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 28 |
try {
|
| 29 |
$this->debug('ADDING ATTACHMENT: ' . $name);
|
| 30 |
$file = $pdf->render();
|
| 31 |
-
$mailObj
|
|
|
|
|
|
|
|
|
|
| 32 |
$file,
|
| 33 |
'application/pdf',
|
| 34 |
Zend_Mime::DISPOSITION_ATTACHMENT,
|
|
@@ -55,9 +58,13 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 55 |
{
|
| 56 |
try {
|
| 57 |
$this->debug('ADDING ATTACHMENT: ' . $file);
|
|
|
|
| 58 |
$filePath = Mage::getBaseDir('media') . DS . 'pdfs' . DS .$file;
|
| 59 |
if (file_exists($filePath)) {
|
| 60 |
-
$mailObj
|
|
|
|
|
|
|
|
|
|
| 61 |
file_get_contents($filePath),
|
| 62 |
'application/pdf',
|
| 63 |
Zend_Mime::DISPOSITION_ATTACHMENT,
|
|
@@ -99,15 +106,24 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 99 |
} else {
|
| 100 |
$processor = $cmsHelper->getPageTemplateProcessor();
|
| 101 |
$content = $processor->filter($agreement->getContent());
|
|
|
|
|
|
|
|
|
|
| 102 |
if ($agreement->getIsHtml()) {
|
| 103 |
-
$html = '<html><head
|
|
|
|
|
|
|
| 104 |
. $content . '</body></html>';
|
| 105 |
-
|
| 106 |
-
|
| 107 |
-
|
| 108 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 109 |
} else {
|
| 110 |
-
$mailObj->
|
| 111 |
Mage::helper('core')->escapeHtml($content), 'text/plain',
|
| 112 |
Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64,
|
| 113 |
$this->_encodedFileName($agreement->getName() . '.txt')
|
|
@@ -153,10 +169,10 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 153 |
{
|
| 154 |
$block->addButton(
|
| 155 |
'fooman_print', array(
|
| 156 |
-
'label'
|
| 157 |
-
'class'
|
| 158 |
-
'onclick'
|
| 159 |
-
)
|
| 160 |
);
|
| 161 |
}
|
| 162 |
|
| 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(
|
| 35 |
$file,
|
| 36 |
'application/pdf',
|
| 37 |
Zend_Mime::DISPOSITION_ATTACHMENT,
|
| 58 |
{
|
| 59 |
try {
|
| 60 |
$this->debug('ADDING ATTACHMENT: ' . $file);
|
| 61 |
+
$mailObj->getMail()->setType(Zend_Mime::MULTIPART_MIXED);
|
| 62 |
$filePath = Mage::getBaseDir('media') . DS . 'pdfs' . DS .$file;
|
| 63 |
if (file_exists($filePath)) {
|
| 64 |
+
if (!($mailObj instanceof Zend_Mail)) {
|
| 65 |
+
$mailObj = $mailObj->getMail();
|
| 66 |
+
}
|
| 67 |
+
$mailObj->createAttachment(
|
| 68 |
file_get_contents($filePath),
|
| 69 |
'application/pdf',
|
| 70 |
Zend_Mime::DISPOSITION_ATTACHMENT,
|
| 106 |
} else {
|
| 107 |
$processor = $cmsHelper->getPageTemplateProcessor();
|
| 108 |
$content = $processor->filter($agreement->getContent());
|
| 109 |
+
if (!($mailObj instanceof Zend_Mail)) {
|
| 110 |
+
$mailObj = $mailObj->getMail();
|
| 111 |
+
}
|
| 112 |
if ($agreement->getIsHtml()) {
|
| 113 |
+
$html = '<html><head>
|
| 114 |
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
| 115 |
+
<title>' . $agreement->getName() . '</title></head><body>'
|
| 116 |
. $content . '</body></html>';
|
| 117 |
+
|
| 118 |
+
$mp = new Zend_Mime_Part($html);
|
| 119 |
+
$mp->encoding = Zend_Mime::ENCODING_BASE64;
|
| 120 |
+
$mp->type = 'text/html; charset=UTF-8';
|
| 121 |
+
$mp->charset = 'UTF-8';
|
| 122 |
+
$mp->disposition = Zend_Mime::DISPOSITION_ATTACHMENT;
|
| 123 |
+
$mp->filename = $this->_encodedFileName($agreement->getName() . '.html');
|
| 124 |
+
$mailObj->addAttachment($mp);
|
| 125 |
} else {
|
| 126 |
+
$mailObj->createAttachment(
|
| 127 |
Mage::helper('core')->escapeHtml($content), 'text/plain',
|
| 128 |
Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64,
|
| 129 |
$this->_encodedFileName($agreement->getName() . '.txt')
|
| 169 |
{
|
| 170 |
$block->addButton(
|
| 171 |
'fooman_print', array(
|
| 172 |
+
'label' => Mage::helper('sales')->__('Print'),
|
| 173 |
+
'class' => 'save',
|
| 174 |
+
'onclick' => 'setLocation(\'' . $this->getPrintUrl($block) . '\')'
|
| 175 |
+
), 0, 30
|
| 176 |
);
|
| 177 |
}
|
| 178 |
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue extends Mage_Core_Model_Email_Queue
|
| 3 |
+
{
|
| 4 |
+
/**
|
| 5 |
+
* Send all messages in a queue
|
| 6 |
+
* dispatch an event see EDITs
|
| 7 |
+
*
|
| 8 |
+
* @return Mage_Core_Model_Email_Queue
|
| 9 |
+
*/
|
| 10 |
+
public function send()
|
| 11 |
+
{
|
| 12 |
+
/** @var $collection Mage_Core_Model_Resource_Email_Queue_Collection */
|
| 13 |
+
$collection = Mage::getModel('core/email_queue')->getCollection()
|
| 14 |
+
->addOnlyForSendingFilter()
|
| 15 |
+
->setPageSize(self::MESSAGES_LIMIT_PER_CRON_RUN)
|
| 16 |
+
->setCurPage(1)
|
| 17 |
+
->load();
|
| 18 |
+
|
| 19 |
+
|
| 20 |
+
ini_set('SMTP', Mage::getStoreConfig('system/smtp/host'));
|
| 21 |
+
ini_set('smtp_port', Mage::getStoreConfig('system/smtp/port'));
|
| 22 |
+
|
| 23 |
+
/** @var $message Mage_Core_Model_Email_Queue */
|
| 24 |
+
foreach ($collection as $message) {
|
| 25 |
+
if ($message->getId()) {
|
| 26 |
+
$parameters = new Varien_Object($message->getMessageParameters());
|
| 27 |
+
if ($parameters->getReturnPathEmail() !== null) {
|
| 28 |
+
$mailTransport = new Zend_Mail_Transport_Sendmail("-f" . $parameters->getReturnPathEmail());
|
| 29 |
+
Zend_Mail::setDefaultTransport($mailTransport);
|
| 30 |
+
} else {
|
| 31 |
+
//EDIT
|
| 32 |
+
$mailTransport = false;
|
| 33 |
+
//End EDIT
|
| 34 |
+
}
|
| 35 |
+
|
| 36 |
+
$mailer = new Zend_Mail('utf-8');
|
| 37 |
+
foreach ($message->getRecipients() as $recipient) {
|
| 38 |
+
list($email, $name, $type) = $recipient;
|
| 39 |
+
switch ($type) {
|
| 40 |
+
case self::EMAIL_TYPE_BCC:
|
| 41 |
+
$mailer->addBcc($email, '=?utf-8?B?' . base64_encode($name) . '?=');
|
| 42 |
+
break;
|
| 43 |
+
case self::EMAIL_TYPE_TO:
|
| 44 |
+
case self::EMAIL_TYPE_CC:
|
| 45 |
+
default:
|
| 46 |
+
$mailer->addTo($email, '=?utf-8?B?' . base64_encode($name) . '?=');
|
| 47 |
+
break;
|
| 48 |
+
}
|
| 49 |
+
}
|
| 50 |
+
|
| 51 |
+
if ($parameters->getIsPlain()) {
|
| 52 |
+
$mailer->setBodyText($message->getMessageBody());
|
| 53 |
+
} else {
|
| 54 |
+
$mailer->setBodyHTML($message->getMessageBody());
|
| 55 |
+
}
|
| 56 |
+
|
| 57 |
+
$mailer->setSubject('=?utf-8?B?' . base64_encode($parameters->getSubject()) . '?=');
|
| 58 |
+
$mailer->setFrom($parameters->getFromEmail(), $parameters->getFromName());
|
| 59 |
+
if ($parameters->getReplyTo() !== null) {
|
| 60 |
+
$mailer->setReplyTo($parameters->getReplyTo());
|
| 61 |
+
}
|
| 62 |
+
if ($parameters->getReturnTo() !== null) {
|
| 63 |
+
$mailer->setReturnPath($parameters->getReturnTo());
|
| 64 |
+
}
|
| 65 |
+
|
| 66 |
+
try {
|
| 67 |
+
//EDIT
|
| 68 |
+
Mage::dispatchEvent(
|
| 69 |
+
'fooman_emailattachments_before_send_queue',
|
| 70 |
+
array(
|
| 71 |
+
'mailer' => $mailer,
|
| 72 |
+
'message' => $message,
|
| 73 |
+
'mail_transport' => $mailTransport
|
| 74 |
+
|
| 75 |
+
)
|
| 76 |
+
);
|
| 77 |
+
//END EDIT
|
| 78 |
+
$mailer->send();
|
| 79 |
+
unset($mailer);
|
| 80 |
+
$message->setProcessedAt(Varien_Date::formatDate(true));
|
| 81 |
+
$message->save();
|
| 82 |
+
}
|
| 83 |
+
catch (Exception $e) {
|
| 84 |
+
unset($mailer);
|
| 85 |
+
$oldDevMode = Mage::getIsDeveloperMode();
|
| 86 |
+
Mage::setIsDeveloperMode(true);
|
| 87 |
+
Mage::logException($e);
|
| 88 |
+
Mage::setIsDeveloperMode($oldDevMode);
|
| 89 |
+
|
| 90 |
+
return false;
|
| 91 |
+
}
|
| 92 |
+
}
|
| 93 |
+
}
|
| 94 |
+
|
| 95 |
+
return $this;
|
| 96 |
+
}
|
| 97 |
+
}
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Template/Mailer.php
CHANGED
|
@@ -28,6 +28,8 @@ class Fooman_EmailAttachments_Model_Core_Email_Template_Mailer extends Mage_Core
|
|
| 28 |
$this->dispatchAttachEvent($emailTemplate, $emailInfo);
|
| 29 |
// Handle "Bcc" recepients of the current email
|
| 30 |
$emailTemplate->addBcc($emailInfo->getBccEmails());
|
|
|
|
|
|
|
| 31 |
// Set required design parameters and delegate email sending to Mage_Core_Model_Email_Template
|
| 32 |
$emailTemplate->setDesignConfig(array('area' => 'frontend', 'store' => $this->getStoreId()))
|
| 33 |
->sendTransactional(
|
| 28 |
$this->dispatchAttachEvent($emailTemplate, $emailInfo);
|
| 29 |
// Handle "Bcc" recepients of the current email
|
| 30 |
$emailTemplate->addBcc($emailInfo->getBccEmails());
|
| 31 |
+
//support queuing on newer Magento versions
|
| 32 |
+
$emailTemplate->setQueue($this->getQueue());
|
| 33 |
// Set required design parameters and delegate email sending to Mage_Core_Model_Email_Template
|
| 34 |
$emailTemplate->setDesignConfig(array('area' => 'frontend', 'store' => $this->getStoreId()))
|
| 35 |
->sendTransactional(
|
app/code/community/Fooman/EmailAttachments/Model/Observer.php
CHANGED
|
@@ -190,7 +190,7 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 190 |
$pdf, $mailTemplate, $this->getShipmentAttachmentName($shipment)
|
| 191 |
);
|
| 192 |
/*
|
| 193 |
-
$pdf = Mage::getModel('sales/
|
| 194 |
$shipment->getOrder()->getInvoiceCollection()
|
| 195 |
);
|
| 196 |
$mailTemplate = Mage::helper('emailattachments')->addAttachment(
|
|
@@ -252,4 +252,39 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 252 |
return Mage::helper('emailattachments')->getCreditmemoAttachmentName($creditmemo);
|
| 253 |
}
|
| 254 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 255 |
}
|
| 190 |
$pdf, $mailTemplate, $this->getShipmentAttachmentName($shipment)
|
| 191 |
);
|
| 192 |
/*
|
| 193 |
+
$pdf = Mage::getModel('sales/order_pdf_invoice')->getPdf(
|
| 194 |
$shipment->getOrder()->getInvoiceCollection()
|
| 195 |
);
|
| 196 |
$mailTemplate = Mage::helper('emailattachments')->addAttachment(
|
| 252 |
return Mage::helper('emailattachments')->getCreditmemoAttachmentName($creditmemo);
|
| 253 |
}
|
| 254 |
|
| 255 |
+
/**
|
| 256 |
+
* listen to order email send event from queue to attach pdfs and agreements
|
| 257 |
+
*
|
| 258 |
+
* @param $observer
|
| 259 |
+
*/
|
| 260 |
+
public function beforeSendQueuedOrder($observer)
|
| 261 |
+
{
|
| 262 |
+
$mailer = $observer->getEvent()->getMailer();
|
| 263 |
+
$message = $observer->getEvent()->getMessage();
|
| 264 |
+
|
| 265 |
+
if ($message->getEntityType() == 'order') {
|
| 266 |
+
$order = Mage::getModel('sales/order')->load($message->getEntityId());
|
| 267 |
+
$storeId = $order->getStoreId();
|
| 268 |
+
$update = false;
|
| 269 |
+
$configPath = $update ? 'order_comment' : 'order';
|
| 270 |
+
|
| 271 |
+
if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachpdf', $storeId)) {
|
| 272 |
+
//Create Pdf and attach to email - play nicely with PdfCustomiser
|
| 273 |
+
$pdf = Mage::getModel('emailattachments/order_pdf_order')->getPdf(array($order));
|
| 274 |
+
$mailer = Mage::helper('emailattachments')->addAttachment(
|
| 275 |
+
$pdf, $mailer, $this->getOrderAttachmentName($order)
|
| 276 |
+
);
|
| 277 |
+
}
|
| 278 |
+
|
| 279 |
+
if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachagreement', $storeId)) {
|
| 280 |
+
$mailer = Mage::helper('emailattachments')->addAgreements($order->getStoreId(), $mailer);
|
| 281 |
+
}
|
| 282 |
+
|
| 283 |
+
$fileAttachment = Mage::getStoreConfig('sales_email/' . $configPath . '/attachfile', $storeId);
|
| 284 |
+
if ($fileAttachment) {
|
| 285 |
+
$mailer = Mage::helper('emailattachments')->addFileAttachment($fileAttachment, $mailer);
|
| 286 |
+
}
|
| 287 |
+
}
|
| 288 |
+
}
|
| 289 |
+
|
| 290 |
}
|
app/code/community/Fooman/EmailAttachments/Model/Selftester.php
CHANGED
|
@@ -30,6 +30,7 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 30 |
{
|
| 31 |
return array(
|
| 32 |
array("model","core/email_template_mailer","Fooman_EmailAttachments_Model_Core_Email_Template_Mailer"),
|
|
|
|
| 33 |
);
|
| 34 |
}
|
| 35 |
|
|
@@ -41,47 +42,54 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 41 |
{
|
| 42 |
//REPLACE
|
| 43 |
return array(
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
|
| 52 |
-
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
| 84 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 85 |
);
|
| 86 |
//REPLACE_END
|
| 87 |
}
|
| 30 |
{
|
| 31 |
return array(
|
| 32 |
array("model","core/email_template_mailer","Fooman_EmailAttachments_Model_Core_Email_Template_Mailer"),
|
| 33 |
+
array("model","core/email_queue","Fooman_EmailAttachments_Model_Core_Email_Queue"),
|
| 34 |
);
|
| 35 |
}
|
| 36 |
|
| 42 |
{
|
| 43 |
//REPLACE
|
| 44 |
return array(
|
| 45 |
+
'app/code/community/Fooman/EmailAttachments/Block/Adminhtml/Extensioninfo.php',
|
| 46 |
+
'app/code/community/Fooman/EmailAttachments/controllers/Customer/OrderController.php',
|
| 47 |
+
'app/code/community/Fooman/EmailAttachments/controllers/Admin/OrderController.php',
|
| 48 |
+
'app/code/community/Fooman/EmailAttachments/etc/config.xml',
|
| 49 |
+
'app/code/community/Fooman/EmailAttachments/etc/system.xml',
|
| 50 |
+
'app/code/community/Fooman/EmailAttachments/Helper/Data.php',
|
| 51 |
+
'app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/Order.php',
|
| 52 |
+
'app/code/community/Fooman/EmailAttachments/Model/Observer.php',
|
| 53 |
+
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Template/Mailer.php',
|
| 54 |
+
'app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php',
|
| 55 |
+
'app/code/community/Fooman/EmailAttachments/Model/System/File.php',
|
| 56 |
+
'app/code/community/Fooman/EmailAttachments/Model/Selftester.php',
|
| 57 |
+
'app/code/community/Fooman/EmailAttachments/LICENSE.txt',
|
| 58 |
+
'app/etc/modules/Fooman_EmailAttachments.xml',
|
| 59 |
+
'app/locale/cs_CZ/Fooman_EmailAttachments.csv',
|
| 60 |
+
'app/locale/nl_NL/Fooman_EmailAttachments.csv',
|
| 61 |
+
'app/locale/en_US/Fooman_EmailAttachments.csv',
|
| 62 |
+
'app/locale/en_US/template/email/sales/order_new_packingslip.html',
|
| 63 |
+
'app/locale/sv_SE/Fooman_EmailAttachments.csv',
|
| 64 |
+
'app/locale/hu_HU/Fooman_EmailAttachments.csv',
|
| 65 |
+
'app/locale/gr_GR/Fooman_EmailAttachments.csv',
|
| 66 |
+
'app/locale/fr_FR/Fooman_EmailAttachments.csv',
|
| 67 |
+
'app/locale/fa_IR/Fooman_EmailAttachments.csv',
|
| 68 |
+
'app/locale/he_IL/Fooman_EmailAttachments.csv',
|
| 69 |
+
'app/locale/de_DE/Fooman_EmailAttachments.csv',
|
| 70 |
+
'app/locale/no_NO/Fooman_EmailAttachments.csv',
|
| 71 |
+
'app/locale/lt_LT/Fooman_EmailAttachments.csv',
|
| 72 |
+
'app/locale/pt_BR/Fooman_EmailAttachments.csv',
|
| 73 |
+
'app/locale/sk_SK/Fooman_EmailAttachments.csv',
|
| 74 |
+
'app/locale/nb_NO/Fooman_EmailAttachments.csv',
|
| 75 |
+
'app/locale/ko_KR/Fooman_EmailAttachments.csv',
|
| 76 |
+
'app/locale/ro_RO/Fooman_EmailAttachments.csv',
|
| 77 |
+
'app/locale/da_DK/Fooman_EmailAttachments.csv',
|
| 78 |
+
'app/locale/sl_SI/Fooman_EmailAttachments.csv',
|
| 79 |
+
'app/locale/et_EE/Fooman_EmailAttachments.csv',
|
| 80 |
+
'app/locale/ar_SA/Fooman_EmailAttachments.csv',
|
| 81 |
+
'app/locale/it_IT/Fooman_EmailAttachments.csv',
|
| 82 |
+
'app/locale/ru_RU/Fooman_EmailAttachments.csv',
|
| 83 |
+
'app/locale/pl_PL/Fooman_EmailAttachments.csv',
|
| 84 |
+
'app/locale/ca_ES/Fooman_EmailAttachments.csv',
|
| 85 |
+
'app/locale/fi_FI/Fooman_EmailAttachments.csv',
|
| 86 |
+
'app/locale/th_TH/Fooman_EmailAttachments.csv',
|
| 87 |
+
'app/locale/tr_TR/Fooman_EmailAttachments.csv',
|
| 88 |
+
'app/locale/es_ES/Fooman_EmailAttachments.csv',
|
| 89 |
+
'app/locale/ja_JP/Fooman_EmailAttachments.csv',
|
| 90 |
+
'app/locale/hr_HR/Fooman_EmailAttachments.csv',
|
| 91 |
+
'app/locale/zh_CN/Fooman_EmailAttachments.csv',
|
| 92 |
+
'app/locale/lv_LV/Fooman_EmailAttachments.csv',
|
| 93 |
);
|
| 94 |
//REPLACE_END
|
| 95 |
}
|
app/code/community/Fooman/EmailAttachments/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Fooman_EmailAttachments>
|
| 5 |
-
<version>0.
|
| 6 |
<depends>
|
| 7 |
</depends>
|
| 8 |
</Fooman_EmailAttachments>
|
|
@@ -16,6 +16,7 @@
|
|
| 16 |
<core>
|
| 17 |
<rewrite>
|
| 18 |
<email_template_mailer>Fooman_EmailAttachments_Model_Core_Email_Template_Mailer</email_template_mailer>
|
|
|
|
| 19 |
</rewrite>
|
| 20 |
</core>
|
| 21 |
</models>
|
|
@@ -36,6 +37,15 @@
|
|
| 36 |
</emailattachments>
|
| 37 |
</helpers>
|
| 38 |
<events>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
<fooman_emailattachments_before_send_order>
|
| 40 |
<observers>
|
| 41 |
<fooman_emailattachments_before_send_order>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Fooman_EmailAttachments>
|
| 5 |
+
<version>0.10.1</version>
|
| 6 |
<depends>
|
| 7 |
</depends>
|
| 8 |
</Fooman_EmailAttachments>
|
| 16 |
<core>
|
| 17 |
<rewrite>
|
| 18 |
<email_template_mailer>Fooman_EmailAttachments_Model_Core_Email_Template_Mailer</email_template_mailer>
|
| 19 |
+
<email_queue>Fooman_EmailAttachments_Model_Core_Email_Queue</email_queue>
|
| 20 |
</rewrite>
|
| 21 |
</core>
|
| 22 |
</models>
|
| 37 |
</emailattachments>
|
| 38 |
</helpers>
|
| 39 |
<events>
|
| 40 |
+
<fooman_emailattachments_before_send_queue>
|
| 41 |
+
<observers>
|
| 42 |
+
<fooman_emailattachments_before_send_queue>
|
| 43 |
+
<type>singleton</type>
|
| 44 |
+
<class>emailattachments/observer</class>
|
| 45 |
+
<method>beforeSendQueuedOrder</method>
|
| 46 |
+
</fooman_emailattachments_before_send_queue>
|
| 47 |
+
</observers>
|
| 48 |
+
</fooman_emailattachments_before_send_queue>
|
| 49 |
<fooman_emailattachments_before_send_order>
|
| 50 |
<observers>
|
| 51 |
<fooman_emailattachments_before_send_order>
|
app/code/community/Fooman/EmailAttachments/modman
CHANGED
|
@@ -32,4 +32,5 @@
|
|
| 32 |
../../../../../app/locale/sl_SI/Fooman_EmailAttachments.csv /app/locale/sl_SI/Fooman_EmailAttachments.csv
|
| 33 |
../../../../../app/locale/sv_SE/Fooman_EmailAttachments.csv /app/locale/sv_SE/Fooman_EmailAttachments.csv
|
| 34 |
../../../../../app/locale/th_TH/Fooman_EmailAttachments.csv /app/locale/th_TH/Fooman_EmailAttachments.csv
|
|
|
|
| 35 |
../../../../../app/locale/zh_CN/Fooman_EmailAttachments.csv /app/locale/zh_CN/Fooman_EmailAttachments.csv
|
| 32 |
../../../../../app/locale/sl_SI/Fooman_EmailAttachments.csv /app/locale/sl_SI/Fooman_EmailAttachments.csv
|
| 33 |
../../../../../app/locale/sv_SE/Fooman_EmailAttachments.csv /app/locale/sv_SE/Fooman_EmailAttachments.csv
|
| 34 |
../../../../../app/locale/th_TH/Fooman_EmailAttachments.csv /app/locale/th_TH/Fooman_EmailAttachments.csv
|
| 35 |
+
../../../../../app/locale/tr_TR/Fooman_EmailAttachments.csv /app/locale/tr_TR/Fooman_EmailAttachments.csv
|
| 36 |
../../../../../app/locale/zh_CN/Fooman_EmailAttachments.csv /app/locale/zh_CN/Fooman_EmailAttachments.csv
|
app/locale/gr_GR/Fooman_EmailAttachments.csv
CHANGED
|
@@ -3,5 +3,5 @@
|
|
| 3 |
"Attach Packing Slip as PDF","Να συμπεριληφθεί η Φορτωτική σε μορφή PDF"
|
| 4 |
"Attach Credit Memo as PDF","Να συμπεριληφθεί το Πιστωτικό Τιμολόγιο σε μορφή PDF"
|
| 5 |
"Attach Order as PDF","Να συμπεριληφθεί η Παραγγελία σε μορφή PDF"
|
| 6 |
-
"Print Orders","
|
| 7 |
-
"Attach Product Attachments","
|
| 3 |
"Attach Packing Slip as PDF","Να συμπεριληφθεί η Φορτωτική σε μορφή PDF"
|
| 4 |
"Attach Credit Memo as PDF","Να συμπεριληφθεί το Πιστωτικό Τιμολόγιο σε μορφή PDF"
|
| 5 |
"Attach Order as PDF","Να συμπεριληφθεί η Παραγγελία σε μορφή PDF"
|
| 6 |
+
"Print Orders","Εκτύπωση παραγγελιών"
|
| 7 |
+
"Attach Product Attachments","Να συμπεριληφθούν συννημένα τα προϊόντα"
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fooman_EmailAttachments</name>
|
| 4 |
-
<version>0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -17,9 +17,9 @@
|
|
| 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>auto-converted</user><email>kristof@fooman.co.nz</email></author><author><name>Kristof Ringleff</name><user>auto-converted</user><email>kristof@fooman.co.nz</email></author></authors>
|
| 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></min><max></max></package></required></dependencies>
|
| 25 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fooman_EmailAttachments</name>
|
| 4 |
+
<version>0.10.2</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>
|
| 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>auto-converted</user><email>kristof@fooman.co.nz</email></author><author><name>Kristof Ringleff</name><user>auto-converted</user><email>kristof@fooman.co.nz</email></author></authors>
|
| 20 |
+
<date>2015-04-11</date>
|
| 21 |
+
<time>01:29:02</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="ed5e88a6ad919408a9f8c74f43e36bf7"/></dir><dir name="Model"><dir name="Core"><dir name="Email"><dir name="Template"><file name="Mailer.php" hash="caf26b4981bb2588ea9c80f789ea327c"/></dir><file name="Queue.php" hash="f3fd963cf345662ece3b6b29b07b1de2"/></dir></dir><dir name="Order"><dir name="Pdf"><file name="Order.php" hash="b8d3bcb8add888068c4ca67caae78b79"/></dir></dir><dir name="System"><file name="File.php" hash="70b05b8e860088b0d2769d7a79c38e0c"/></dir><file name="Observer.php" hash="a7ba9206c8e4be2dc3df9122075e1d71"/><file name="Selftester.php" hash="ebe0281c0b413ae7ff231cac68a91ca9"/></dir><dir name="controllers"><dir name="Admin"><file name="OrderController.php" hash="e6b7c1937dd4f41fe376c799b2b80fdf"/></dir><dir name="Customer"><file name="OrderController.php" hash="bc8d1ae57801fcdf5bc1d5abbac0b879"/></dir></dir><dir name="etc"><file name="config.xml" hash="008a4e9d32f7c696f2d6838711b9088a"/><file name="system.xml" hash="2b1df0a77b34af861b84602a002f136c"/></dir><file name="LICENSE.txt" hash="59563e7be45096d0833dade102989042"/><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><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></target></contents>
|
| 23 |
<compatible/>
|
| 24 |
<dependencies><required><package><name>Fooman_Common</name><channel>community</channel><min></min><max></max></package></required></dependencies>
|
| 25 |
</package>
|
