Version Notes
0.9.2 Release
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Fooman_EmailAttachments |
| Version | 0.11.2 |
| Comparing to | |
| See all releases | |
Code changes from version 0.10.7 to 0.11.2
- app/code/community/Fooman/EmailAttachments/Helper/Data.php +22 -10
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php +3 -93
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Compatibility.php +22 -0
- app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Fooman.php +98 -0
- app/code/community/Fooman/EmailAttachments/Model/Observer.php +50 -34
- app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/BundleItems.php +48 -0
- app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/Order.php +30 -21
- app/code/community/Fooman/EmailAttachments/Model/Selftester.php +15 -1
- app/code/community/Fooman/EmailAttachments/controllers/Adminhtml/EmailAttachments/OrderController.php +86 -0
- app/code/community/Fooman/EmailAttachments/etc/config.xml +17 -7
- app/code/community/Fooman/EmailAttachments/etc/system.xml +527 -146
- app/locale/en_US/template/email/sales/order_new_packingslip.html +73 -0
- app/locale/tr_TR/Fooman_EmailAttachments.csv +7 -0
- package.xml +4 -4
app/code/community/Fooman/EmailAttachments/Helper/Data.php
CHANGED
|
@@ -61,7 +61,9 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 61 |
if (!($mailObj instanceof Zend_Mail)) {
|
| 62 |
$mailObj = $mailObj->getMail();
|
| 63 |
}
|
| 64 |
-
$mailObj
|
|
|
|
|
|
|
| 65 |
$filePath = Mage::getBaseDir('media') . DS . 'pdfs' . DS .$file;
|
| 66 |
if (file_exists($filePath)) {
|
| 67 |
$mailObj->createAttachment(
|
|
@@ -106,7 +108,7 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 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()) {
|
|
@@ -115,13 +117,23 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 115 |
<title>' . $agreement->getName() . '</title></head><body>'
|
| 116 |
. $content . '</body></html>';
|
| 117 |
|
| 118 |
-
$
|
| 119 |
-
|
| 120 |
-
|
| 121 |
-
|
| 122 |
-
|
| 123 |
-
|
| 124 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 125 |
} else {
|
| 126 |
$mailObj->createAttachment(
|
| 127 |
Mage::helper('core')->escapeHtml($content), 'text/plain',
|
|
@@ -187,7 +199,7 @@ class Fooman_EmailAttachments_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 187 |
protected function getPrintUrl($block)
|
| 188 |
{
|
| 189 |
return $block->getUrl(
|
| 190 |
-
'
|
| 191 |
array('order_id' => $block->getOrder()->getId())
|
| 192 |
);
|
| 193 |
}
|
| 61 |
if (!($mailObj instanceof Zend_Mail)) {
|
| 62 |
$mailObj = $mailObj->getMail();
|
| 63 |
}
|
| 64 |
+
if (method_exists($mailObj, 'setType')) {
|
| 65 |
+
$mailObj->setType(Zend_Mime::MULTIPART_MIXED);
|
| 66 |
+
}
|
| 67 |
$filePath = Mage::getBaseDir('media') . DS . 'pdfs' . DS .$file;
|
| 68 |
if (file_exists($filePath)) {
|
| 69 |
$mailObj->createAttachment(
|
| 108 |
} else {
|
| 109 |
$processor = $cmsHelper->getPageTemplateProcessor();
|
| 110 |
$content = $processor->filter($agreement->getContent());
|
| 111 |
+
if (!($mailObj instanceof Zend_Mail) && !($mailObj instanceof Mandrill_Message)) {
|
| 112 |
$mailObj = $mailObj->getMail();
|
| 113 |
}
|
| 114 |
if ($agreement->getIsHtml()) {
|
| 117 |
<title>' . $agreement->getName() . '</title></head><body>'
|
| 118 |
. $content . '</body></html>';
|
| 119 |
|
| 120 |
+
if ($mailObj instanceof Mandrill_Message) {
|
| 121 |
+
// Mandrill does not support addAttachment, so use createAttachment in this case
|
| 122 |
+
$mailObj->createAttachment(
|
| 123 |
+
$html, 'text/html',
|
| 124 |
+
Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64,
|
| 125 |
+
$this->_encodedFileName($agreement->getName() . '.html')
|
| 126 |
+
);
|
| 127 |
+
} else {
|
| 128 |
+
// use addAttachment for Zend_Mail, so that we can set the charset to UTF-8 here
|
| 129 |
+
$mp = new Zend_Mime_Part($html);
|
| 130 |
+
$mp->encoding = Zend_Mime::ENCODING_BASE64;
|
| 131 |
+
$mp->type = 'text/html; charset=UTF-8';
|
| 132 |
+
$mp->charset = 'UTF-8';
|
| 133 |
+
$mp->disposition = Zend_Mime::DISPOSITION_ATTACHMENT;
|
| 134 |
+
$mp->filename = $this->_encodedFileName($agreement->getName() . '.html');
|
| 135 |
+
$mailObj->addAttachment($mp);
|
| 136 |
+
}
|
| 137 |
} else {
|
| 138 |
$mailObj->createAttachment(
|
| 139 |
Mage::helper('core')->escapeHtml($content), 'text/plain',
|
| 199 |
protected function getPrintUrl($block)
|
| 200 |
{
|
| 201 |
return $block->getUrl(
|
| 202 |
+
'adminhtml/EmailAttachments_order/print',
|
| 203 |
array('order_id' => $block->getOrder()->getId())
|
| 204 |
);
|
| 205 |
}
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue.php
CHANGED
|
@@ -1,97 +1,7 @@
|
|
| 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 |
-
|
| 52 |
-
|
| 53 |
-
|
| 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 |
}
|
| 1 |
<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
|
| 3 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue
|
| 4 |
+
extends Fooman_EmailAttachments_Model_Core_Email_Queue_Compatibility
|
| 5 |
+
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 6 |
|
|
|
|
|
|
|
| 7 |
}
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Compatibility.php
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
if (Mage::helper('core')->isModuleEnabled('Aschroder_SMTPPro')
|
| 4 |
+
&& version_compare(
|
| 5 |
+
(string)Mage::getConfig()->getNode()->modules->Aschroder_SMTPPro->version,
|
| 6 |
+
'2.0.6', '>'
|
| 7 |
+
)
|
| 8 |
+
) {
|
| 9 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue_Compatibility
|
| 10 |
+
extends Aschroder_SMTPPro_Model_Email_Queue
|
| 11 |
+
{
|
| 12 |
+
|
| 13 |
+
}
|
| 14 |
+
} else {
|
| 15 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue_Compatibility
|
| 16 |
+
extends Fooman_EmailAttachments_Model_Core_Email_Queue_Fooman
|
| 17 |
+
{
|
| 18 |
+
|
| 19 |
+
}
|
| 20 |
+
}
|
| 21 |
+
|
| 22 |
+
|
app/code/community/Fooman/EmailAttachments/Model/Core/Email/Queue/Fooman.php
ADDED
|
@@ -0,0 +1,98 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class Fooman_EmailAttachments_Model_Core_Email_Queue_Fooman extends Mage_Core_Model_Email_Queue
|
| 4 |
+
{
|
| 5 |
+
/**
|
| 6 |
+
* Send all messages in a queue
|
| 7 |
+
* dispatch an event see EDITs
|
| 8 |
+
*
|
| 9 |
+
* @return Mage_Core_Model_Email_Queue
|
| 10 |
+
*/
|
| 11 |
+
public function send()
|
| 12 |
+
{
|
| 13 |
+
/** @var $collection Mage_Core_Model_Resource_Email_Queue_Collection */
|
| 14 |
+
$collection = Mage::getModel('core/email_queue')->getCollection()
|
| 15 |
+
->addOnlyForSendingFilter()
|
| 16 |
+
->setPageSize(self::MESSAGES_LIMIT_PER_CRON_RUN)
|
| 17 |
+
->setCurPage(1)
|
| 18 |
+
->load();
|
| 19 |
+
|
| 20 |
+
|
| 21 |
+
ini_set('SMTP', Mage::getStoreConfig('system/smtp/host'));
|
| 22 |
+
ini_set('smtp_port', Mage::getStoreConfig('system/smtp/port'));
|
| 23 |
+
|
| 24 |
+
/** @var $message Mage_Core_Model_Email_Queue */
|
| 25 |
+
foreach ($collection as $message) {
|
| 26 |
+
if ($message->getId()) {
|
| 27 |
+
$parameters = new Varien_Object($message->getMessageParameters());
|
| 28 |
+
if ($parameters->getReturnPathEmail() !== null) {
|
| 29 |
+
$mailTransport = new Zend_Mail_Transport_Sendmail("-f" . $parameters->getReturnPathEmail());
|
| 30 |
+
Zend_Mail::setDefaultTransport($mailTransport);
|
| 31 |
+
} else {
|
| 32 |
+
//EDIT
|
| 33 |
+
$mailTransport = false;
|
| 34 |
+
//End EDIT
|
| 35 |
+
}
|
| 36 |
+
|
| 37 |
+
$mailer = new Zend_Mail('utf-8');
|
| 38 |
+
foreach ($message->getRecipients() as $recipient) {
|
| 39 |
+
list($email, $name, $type) = $recipient;
|
| 40 |
+
switch ($type) {
|
| 41 |
+
case self::EMAIL_TYPE_BCC:
|
| 42 |
+
$mailer->addBcc($email, '=?utf-8?B?' . base64_encode($name) . '?=');
|
| 43 |
+
break;
|
| 44 |
+
case self::EMAIL_TYPE_TO:
|
| 45 |
+
case self::EMAIL_TYPE_CC:
|
| 46 |
+
default:
|
| 47 |
+
$mailer->addTo($email, '=?utf-8?B?' . base64_encode($name) . '?=');
|
| 48 |
+
break;
|
| 49 |
+
}
|
| 50 |
+
}
|
| 51 |
+
|
| 52 |
+
if ($parameters->getIsPlain()) {
|
| 53 |
+
$mailer->setBodyText($message->getMessageBody());
|
| 54 |
+
} else {
|
| 55 |
+
$mailer->setBodyHTML($message->getMessageBody());
|
| 56 |
+
}
|
| 57 |
+
|
| 58 |
+
$mailer->setSubject('=?utf-8?B?' . base64_encode($parameters->getSubject()) . '?=');
|
| 59 |
+
$mailer->setFrom($parameters->getFromEmail(), $parameters->getFromName());
|
| 60 |
+
if ($parameters->getReplyTo() !== null) {
|
| 61 |
+
$mailer->setReplyTo($parameters->getReplyTo());
|
| 62 |
+
}
|
| 63 |
+
if ($parameters->getReturnTo() !== null) {
|
| 64 |
+
$mailer->setReturnPath($parameters->getReturnTo());
|
| 65 |
+
}
|
| 66 |
+
|
| 67 |
+
try {
|
| 68 |
+
//EDIT
|
| 69 |
+
Mage::dispatchEvent(
|
| 70 |
+
'fooman_emailattachments_before_send_queue',
|
| 71 |
+
array(
|
| 72 |
+
'mailer' => $mailer,
|
| 73 |
+
'message' => $message,
|
| 74 |
+
'mail_transport' => $mailTransport
|
| 75 |
+
|
| 76 |
+
)
|
| 77 |
+
);
|
| 78 |
+
//END EDIT
|
| 79 |
+
$mailer->send();
|
| 80 |
+
unset($mailer);
|
| 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 |
+
|
| 96 |
+
return $this;
|
| 97 |
+
}
|
| 98 |
+
}
|
app/code/community/Fooman/EmailAttachments/Model/Observer.php
CHANGED
|
@@ -8,7 +8,6 @@
|
|
| 8 |
* For the full copyright and license information, please view the LICENSE
|
| 9 |
* file that was distributed with this source code.
|
| 10 |
*/
|
| 11 |
-
|
| 12 |
class Fooman_EmailAttachments_Model_Observer
|
| 13 |
{
|
| 14 |
|
|
@@ -46,10 +45,10 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 46 |
) {
|
| 47 |
$block->addItem(
|
| 48 |
'fooman_pdforders_order', array(
|
| 49 |
-
'label'=> Mage::helper('emailattachments')->__('Print Orders'),
|
| 50 |
-
'url'
|
| 51 |
-
'
|
| 52 |
-
Mage::app()->getStore()->isCurrentlySecure() ? array('_secure'=> 1) : array()
|
| 53 |
),
|
| 54 |
)
|
| 55 |
);
|
|
@@ -86,9 +85,11 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 86 |
Mage::helper('emailattachments')->addAgreements($order->getStoreId(), $mailTemplate);
|
| 87 |
}
|
| 88 |
|
| 89 |
-
$
|
| 90 |
-
|
| 91 |
-
|
|
|
|
|
|
|
| 92 |
}
|
| 93 |
}
|
| 94 |
|
|
@@ -168,9 +169,11 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 168 |
Mage::helper('emailattachments')->addAgreements($storeId, $mailTemplate);
|
| 169 |
}
|
| 170 |
|
| 171 |
-
$
|
| 172 |
-
|
| 173 |
-
|
|
|
|
|
|
|
| 174 |
}
|
| 175 |
}
|
| 176 |
|
|
@@ -184,7 +187,7 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 184 |
*
|
| 185 |
* @param $observer
|
| 186 |
*/
|
| 187 |
-
public function beforeSendShipment
|
| 188 |
{
|
| 189 |
$update = $observer->getEvent()->getUpdate();
|
| 190 |
$mailTemplate = $observer->getEvent()->getTemplate();
|
|
@@ -215,9 +218,11 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 215 |
Mage::helper('emailattachments')->addAgreements($storeId, $mailTemplate);
|
| 216 |
}
|
| 217 |
|
| 218 |
-
$
|
| 219 |
-
|
| 220 |
-
|
|
|
|
|
|
|
| 221 |
}
|
| 222 |
}
|
| 223 |
|
|
@@ -231,7 +236,7 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 231 |
*
|
| 232 |
* @param $observer
|
| 233 |
*/
|
| 234 |
-
public function beforeSendCreditmemo
|
| 235 |
{
|
| 236 |
$update = $observer->getEvent()->getUpdate();
|
| 237 |
$mailTemplate = $observer->getEvent()->getTemplate();
|
|
@@ -252,9 +257,11 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 252 |
Mage::helper('emailattachments')->addAgreements($storeId, $mailTemplate);
|
| 253 |
}
|
| 254 |
|
| 255 |
-
$
|
| 256 |
-
|
| 257 |
-
|
|
|
|
|
|
|
| 258 |
}
|
| 259 |
}
|
| 260 |
|
|
@@ -263,20 +270,12 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 263 |
return Mage::helper('emailattachments')->getCreditmemoAttachmentName($creditmemo);
|
| 264 |
}
|
| 265 |
|
| 266 |
-
|
| 267 |
-
* listen to order email send event from queue to attach pdfs and agreements
|
| 268 |
-
*
|
| 269 |
-
* @param $observer
|
| 270 |
-
*/
|
| 271 |
-
public function beforeSendQueuedOrder($observer)
|
| 272 |
{
|
| 273 |
-
|
| 274 |
-
$message = $observer->getEvent()->getMessage();
|
| 275 |
-
|
| 276 |
-
if ($message->getEntityType() == 'order') {
|
| 277 |
$order = Mage::getModel('sales/order')->load($message->getEntityId());
|
| 278 |
$storeId = $order->getStoreId();
|
| 279 |
-
$update =
|
| 280 |
$configPath = $update ? 'order_comment' : 'order';
|
| 281 |
|
| 282 |
if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachpdf', $storeId)) {
|
|
@@ -288,14 +287,31 @@ class Fooman_EmailAttachments_Model_Observer
|
|
| 288 |
}
|
| 289 |
|
| 290 |
if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachagreement', $storeId)) {
|
| 291 |
-
|
| 292 |
}
|
| 293 |
|
| 294 |
-
$
|
| 295 |
-
|
| 296 |
-
|
|
|
|
|
|
|
| 297 |
}
|
| 298 |
}
|
| 299 |
}
|
| 300 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 301 |
}
|
| 8 |
* For the full copyright and license information, please view the LICENSE
|
| 9 |
* file that was distributed with this source code.
|
| 10 |
*/
|
|
|
|
| 11 |
class Fooman_EmailAttachments_Model_Observer
|
| 12 |
{
|
| 13 |
|
| 45 |
) {
|
| 46 |
$block->addItem(
|
| 47 |
'fooman_pdforders_order', array(
|
| 48 |
+
'label' => Mage::helper('emailattachments')->__('Print Orders'),
|
| 49 |
+
'url' => Mage::helper('adminhtml')->getUrl(
|
| 50 |
+
'adminhtml/EmailAttachments_order/pdforders',
|
| 51 |
+
Mage::app()->getStore()->isCurrentlySecure() ? array('_secure' => 1) : array()
|
| 52 |
),
|
| 53 |
)
|
| 54 |
);
|
| 85 |
Mage::helper('emailattachments')->addAgreements($order->getStoreId(), $mailTemplate);
|
| 86 |
}
|
| 87 |
|
| 88 |
+
for ($i = 0; $i <= 5; $i++) {
|
| 89 |
+
$fileAttachment = Mage::getStoreConfig('sales_email/'.$configPath.'/attachfile_'.$i, $storeId);
|
| 90 |
+
if ($fileAttachment) {
|
| 91 |
+
Mage::helper('emailattachments')->addFileAttachment($fileAttachment, $mailTemplate);
|
| 92 |
+
}
|
| 93 |
}
|
| 94 |
}
|
| 95 |
|
| 169 |
Mage::helper('emailattachments')->addAgreements($storeId, $mailTemplate);
|
| 170 |
}
|
| 171 |
|
| 172 |
+
for ($i = 0; $i <= 5; $i++) {
|
| 173 |
+
$fileAttachment = Mage::getStoreConfig('sales_email/'.$configPath.'/attachfile_'.$i, $storeId);
|
| 174 |
+
if ($fileAttachment) {
|
| 175 |
+
Mage::helper('emailattachments')->addFileAttachment($fileAttachment, $mailTemplate);
|
| 176 |
+
}
|
| 177 |
}
|
| 178 |
}
|
| 179 |
|
| 187 |
*
|
| 188 |
* @param $observer
|
| 189 |
*/
|
| 190 |
+
public function beforeSendShipment($observer)
|
| 191 |
{
|
| 192 |
$update = $observer->getEvent()->getUpdate();
|
| 193 |
$mailTemplate = $observer->getEvent()->getTemplate();
|
| 218 |
Mage::helper('emailattachments')->addAgreements($storeId, $mailTemplate);
|
| 219 |
}
|
| 220 |
|
| 221 |
+
for ($i = 0; $i <= 5; $i++) {
|
| 222 |
+
$fileAttachment = Mage::getStoreConfig('sales_email/'.$configPath.'/attachfile_'.$i, $storeId);
|
| 223 |
+
if ($fileAttachment) {
|
| 224 |
+
Mage::helper('emailattachments')->addFileAttachment($fileAttachment, $mailTemplate);
|
| 225 |
+
}
|
| 226 |
}
|
| 227 |
}
|
| 228 |
|
| 236 |
*
|
| 237 |
* @param $observer
|
| 238 |
*/
|
| 239 |
+
public function beforeSendCreditmemo($observer)
|
| 240 |
{
|
| 241 |
$update = $observer->getEvent()->getUpdate();
|
| 242 |
$mailTemplate = $observer->getEvent()->getTemplate();
|
| 257 |
Mage::helper('emailattachments')->addAgreements($storeId, $mailTemplate);
|
| 258 |
}
|
| 259 |
|
| 260 |
+
for ($i = 0; $i <= 5; $i++) {
|
| 261 |
+
$fileAttachment = Mage::getStoreConfig('sales_email/'.$configPath.'/attachfile_'.$i, $storeId);
|
| 262 |
+
if ($fileAttachment) {
|
| 263 |
+
Mage::helper('emailattachments')->addFileAttachment($fileAttachment, $mailTemplate);
|
| 264 |
+
}
|
| 265 |
}
|
| 266 |
}
|
| 267 |
|
| 270 |
return Mage::helper('emailattachments')->getCreditmemoAttachmentName($creditmemo);
|
| 271 |
}
|
| 272 |
|
| 273 |
+
protected function _processSendQueueEvent($mailer, $message)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 274 |
{
|
| 275 |
+
if ($message->getEntityType() == 'order' && !$message->getProcessedAt()) {
|
|
|
|
|
|
|
|
|
|
| 276 |
$order = Mage::getModel('sales/order')->load($message->getEntityId());
|
| 277 |
$storeId = $order->getStoreId();
|
| 278 |
+
$update = $message->getEventType() == 'update_order';
|
| 279 |
$configPath = $update ? 'order_comment' : 'order';
|
| 280 |
|
| 281 |
if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachpdf', $storeId)) {
|
| 287 |
}
|
| 288 |
|
| 289 |
if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachagreement', $storeId)) {
|
| 290 |
+
Mage::helper('emailattachments')->addAgreements($order->getStoreId(), $mailer);
|
| 291 |
}
|
| 292 |
|
| 293 |
+
for ($i = 0; $i <= 5; $i++) {
|
| 294 |
+
$fileAttachment = Mage::getStoreConfig('sales_email/'.$configPath.'/attachfile_'.$i, $storeId);
|
| 295 |
+
if ($fileAttachment) {
|
| 296 |
+
Mage::helper('emailattachments')->addFileAttachment($fileAttachment, $mailer);
|
| 297 |
+
}
|
| 298 |
}
|
| 299 |
}
|
| 300 |
}
|
| 301 |
|
| 302 |
+
/**
|
| 303 |
+
* listen to order email send event from queue to attach pdfs and agreements
|
| 304 |
+
*
|
| 305 |
+
* @param $observer
|
| 306 |
+
*/
|
| 307 |
+
public function beforeSendQueuedOrder($observer)
|
| 308 |
+
{
|
| 309 |
+
$mailer = $observer->getEvent()->getMailer()
|
| 310 |
+
? $observer->getEvent()->getMailer()
|
| 311 |
+
: $observer->getEvent()->getMail();
|
| 312 |
+
$message = $observer->getEvent()->getMessage();
|
| 313 |
+
|
| 314 |
+
$this->_processSendQueueEvent($mailer, $message);
|
| 315 |
+
}
|
| 316 |
+
|
| 317 |
}
|
app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/BundleItems.php
ADDED
|
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
* @author Kristof Ringleff
|
| 5 |
+
* @author Magento Core Team <core@magentocommerce.com>
|
| 6 |
+
* @package Fooman_EmailAttachments
|
| 7 |
+
* @copyright Copyright (c) 2009 Fooman Limited (http://www.fooman.co.nz)
|
| 8 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
| 9 |
+
*
|
| 10 |
+
* For the full copyright and license information, please view the LICENSE
|
| 11 |
+
* file that was distributed with this source code.
|
| 12 |
+
*/
|
| 13 |
+
class Fooman_EmailAttachments_Model_Order_Pdf_BundleItems extends Mage_Bundle_Model_Sales_Order_Pdf_Items_Invoice
|
| 14 |
+
{
|
| 15 |
+
/**
|
| 16 |
+
* @param Varien_Object $item
|
| 17 |
+
*
|
| 18 |
+
* @return null
|
| 19 |
+
*/
|
| 20 |
+
public function getChilds($item)
|
| 21 |
+
{
|
| 22 |
+
|
| 23 |
+
$_itemsArray = array();
|
| 24 |
+
|
| 25 |
+
if ($item instanceof Mage_Sales_Model_Order_Item) {
|
| 26 |
+
$_items = $item->getOrder()->getAllItems();
|
| 27 |
+
}
|
| 28 |
+
|
| 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;
|
| 35 |
+
} else {
|
| 36 |
+
$_itemsArray[$_item->getId()][$_item->getId()] = $_item;
|
| 37 |
+
}
|
| 38 |
+
}
|
| 39 |
+
}
|
| 40 |
+
|
| 41 |
+
if (isset($_itemsArray[$item->getId()])) {
|
| 42 |
+
return $_itemsArray[$item->getId()];
|
| 43 |
+
} else {
|
| 44 |
+
return null;
|
| 45 |
+
}
|
| 46 |
+
}
|
| 47 |
+
}
|
| 48 |
+
|
app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/Order.php
CHANGED
|
@@ -10,7 +10,6 @@
|
|
| 10 |
* For the full copyright and license information, please view the LICENSE
|
| 11 |
* file that was distributed with this source code.
|
| 12 |
*/
|
| 13 |
-
|
| 14 |
class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Order_Pdf_Invoice
|
| 15 |
{
|
| 16 |
|
|
@@ -21,7 +20,7 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 21 |
*
|
| 22 |
* @return Zend_Pdf
|
| 23 |
*/
|
| 24 |
-
public function getPdf
|
| 25 |
{
|
| 26 |
$this->_beforeGetPdf();
|
| 27 |
$this->_initRenderer('order');
|
|
@@ -33,7 +32,7 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 33 |
$currentStoreId = Mage::app()->getStore()->getId();
|
| 34 |
foreach ($orders as $order) {
|
| 35 |
//could be order id
|
| 36 |
-
if (
|
| 37 |
$order = Mage::getModel('sales/order')->load($order);
|
| 38 |
}
|
| 39 |
|
|
@@ -58,27 +57,16 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 58 |
true
|
| 59 |
);
|
| 60 |
|
| 61 |
-
$
|
| 62 |
-
$this->_setFontRegular($page);
|
| 63 |
-
|
| 64 |
-
/* Add table */
|
| 65 |
-
$page->setFillColor(new Zend_Pdf_Color_RGB(0.93, 0.92, 0.92));
|
| 66 |
-
$page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
|
| 67 |
-
$page->setLineWidth(0.5);
|
| 68 |
-
|
| 69 |
-
$page->drawRectangle(25, $this->y, 570, $this->y - 15);
|
| 70 |
-
$this->y -=10;
|
| 71 |
-
|
| 72 |
-
$page = $this->_printTableHead($page);
|
| 73 |
|
| 74 |
$page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
|
| 75 |
|
| 76 |
-
$
|
| 77 |
|
| 78 |
/* Add totals */
|
| 79 |
$order->setOrder($order);
|
| 80 |
$page = $this->insertTotals($page, $order);
|
| 81 |
-
$
|
| 82 |
|
| 83 |
if ($order->getStoreId()) {
|
| 84 |
Mage::app()->getLocale()->revert();
|
|
@@ -87,6 +75,7 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 87 |
|
| 88 |
$this->_afterGetPdf();
|
| 89 |
Mage::app()->setCurrentStore($currentStoreId);
|
|
|
|
| 90 |
return $pdf;
|
| 91 |
}
|
| 92 |
|
|
@@ -108,7 +97,6 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 108 |
$item->setOrderItem($item);
|
| 109 |
$page = $this->_drawItem($item, $page, $order);
|
| 110 |
}
|
| 111 |
-
return $page;
|
| 112 |
}
|
| 113 |
|
| 114 |
protected function _printComments($order, Zend_Pdf_Page $page)
|
|
@@ -135,11 +123,33 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 135 |
$page->drawText(implode(' ', $currentLine), 35, $this->y, 'UTF-8');
|
| 136 |
}
|
| 137 |
}
|
| 138 |
-
return $page;
|
| 139 |
}
|
| 140 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 141 |
protected function _printTableHead($page)
|
| 142 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 143 |
/* Add table head */
|
| 144 |
$page->setFillColor(new Zend_Pdf_Color_RGB(0.4, 0.4, 0.4));
|
| 145 |
$page->drawText(Mage::helper('sales')->__('Products'), 35, $this->y, 'UTF-8');
|
|
@@ -149,7 +159,6 @@ class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Ord
|
|
| 149 |
$page->drawText(Mage::helper('sales')->__('Tax'), 480, $this->y, 'UTF-8');
|
| 150 |
$page->drawText(Mage::helper('sales')->__('Subtotal'), 535, $this->y, 'UTF-8');
|
| 151 |
|
| 152 |
-
$this->y -=15;
|
| 153 |
-
return $page;
|
| 154 |
}
|
| 155 |
}
|
| 10 |
* For the full copyright and license information, please view the LICENSE
|
| 11 |
* file that was distributed with this source code.
|
| 12 |
*/
|
|
|
|
| 13 |
class Fooman_EmailAttachments_Model_Order_Pdf_Order extends Mage_Sales_Model_Order_Pdf_Invoice
|
| 14 |
{
|
| 15 |
|
| 20 |
*
|
| 21 |
* @return Zend_Pdf
|
| 22 |
*/
|
| 23 |
+
public function getPdf($orders = array())
|
| 24 |
{
|
| 25 |
$this->_beforeGetPdf();
|
| 26 |
$this->_initRenderer('order');
|
| 32 |
$currentStoreId = Mage::app()->getStore()->getId();
|
| 33 |
foreach ($orders as $order) {
|
| 34 |
//could be order id
|
| 35 |
+
if (!$order instanceof Mage_Sales_Model_Order) {
|
| 36 |
$order = Mage::getModel('sales/order')->load($order);
|
| 37 |
}
|
| 38 |
|
| 57 |
true
|
| 58 |
);
|
| 59 |
|
| 60 |
+
$this->_printTableHead($page);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 61 |
|
| 62 |
$page->setFillColor(new Zend_Pdf_Color_GrayScale(0));
|
| 63 |
|
| 64 |
+
$this->_printItems($order, $page);
|
| 65 |
|
| 66 |
/* Add totals */
|
| 67 |
$order->setOrder($order);
|
| 68 |
$page = $this->insertTotals($page, $order);
|
| 69 |
+
$this->_printComments($order, $page);
|
| 70 |
|
| 71 |
if ($order->getStoreId()) {
|
| 72 |
Mage::app()->getLocale()->revert();
|
| 75 |
|
| 76 |
$this->_afterGetPdf();
|
| 77 |
Mage::app()->setCurrentStore($currentStoreId);
|
| 78 |
+
|
| 79 |
return $pdf;
|
| 80 |
}
|
| 81 |
|
| 97 |
$item->setOrderItem($item);
|
| 98 |
$page = $this->_drawItem($item, $page, $order);
|
| 99 |
}
|
|
|
|
| 100 |
}
|
| 101 |
|
| 102 |
protected function _printComments($order, Zend_Pdf_Page $page)
|
| 123 |
$page->drawText(implode(' ', $currentLine), 35, $this->y, 'UTF-8');
|
| 124 |
}
|
| 125 |
}
|
|
|
|
| 126 |
}
|
| 127 |
|
| 128 |
+
/**
|
| 129 |
+
* Draw header for item table
|
| 130 |
+
*
|
| 131 |
+
* use _drawHeader for Magento 1.7+
|
| 132 |
+
* maintain compatibility with Magento 1.5
|
| 133 |
+
*
|
| 134 |
+
* @param $page
|
| 135 |
+
*/
|
| 136 |
protected function _printTableHead($page)
|
| 137 |
{
|
| 138 |
+
if (method_exists($this, '_drawHeader')) {
|
| 139 |
+
return parent::_drawHeader($page);
|
| 140 |
+
}
|
| 141 |
+
|
| 142 |
+
$page->setFillColor(new Zend_Pdf_Color_GrayScale(1));
|
| 143 |
+
$this->_setFontRegular($page);
|
| 144 |
+
|
| 145 |
+
/* Add table */
|
| 146 |
+
$page->setFillColor(new Zend_Pdf_Color_RGB(0.93, 0.92, 0.92));
|
| 147 |
+
$page->setLineColor(new Zend_Pdf_Color_GrayScale(0.5));
|
| 148 |
+
$page->setLineWidth(0.5);
|
| 149 |
+
|
| 150 |
+
$page->drawRectangle(25, $this->y, 570, $this->y - 15);
|
| 151 |
+
$this->y -= 10;
|
| 152 |
+
|
| 153 |
/* Add table head */
|
| 154 |
$page->setFillColor(new Zend_Pdf_Color_RGB(0.4, 0.4, 0.4));
|
| 155 |
$page->drawText(Mage::helper('sales')->__('Products'), 35, $this->y, 'UTF-8');
|
| 159 |
$page->drawText(Mage::helper('sales')->__('Tax'), 480, $this->y, 'UTF-8');
|
| 160 |
$page->drawText(Mage::helper('sales')->__('Subtotal'), 535, $this->y, 'UTF-8');
|
| 161 |
|
| 162 |
+
$this->y -= 15;
|
|
|
|
| 163 |
}
|
| 164 |
}
|
app/code/community/Fooman/EmailAttachments/Model/Selftester.php
CHANGED
|
@@ -54,10 +54,13 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 54 |
'app/code/community/Fooman/EmailAttachments/Block/Adminhtml/Extensioninfo.php',
|
| 55 |
'app/code/community/Fooman/EmailAttachments/LICENSE.txt',
|
| 56 |
'app/code/community/Fooman/EmailAttachments/controllers/Customer/OrderController.php',
|
| 57 |
-
'app/code/community/Fooman/EmailAttachments/controllers/
|
| 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/Order/Pdf/Order.php',
|
| 62 |
'app/code/community/Fooman/EmailAttachments/Model/Selftester.php',
|
| 63 |
'app/code/community/Fooman/EmailAttachments/Model/Observer.php',
|
|
@@ -75,6 +78,7 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 75 |
'app/locale/sl_SI/Fooman_EmailAttachments.csv',
|
| 76 |
'app/locale/ca_ES/Fooman_EmailAttachments.csv',
|
| 77 |
'app/locale/es_ES/Fooman_EmailAttachments.csv',
|
|
|
|
| 78 |
'app/locale/ar_SA/Fooman_EmailAttachments.csv',
|
| 79 |
'app/locale/lt_LT/Fooman_EmailAttachments.csv',
|
| 80 |
'app/locale/th_TH/Fooman_EmailAttachments.csv',
|
|
@@ -85,6 +89,7 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 85 |
'app/locale/ru_RU/Fooman_EmailAttachments.csv',
|
| 86 |
'app/locale/lv_LV/Fooman_EmailAttachments.csv',
|
| 87 |
'app/locale/fi_FI/Fooman_EmailAttachments.csv',
|
|
|
|
| 88 |
'app/locale/en_US/Fooman_EmailAttachments.csv',
|
| 89 |
'app/locale/ro_RO/Fooman_EmailAttachments.csv',
|
| 90 |
'app/locale/de_DE/Fooman_EmailAttachments.csv',
|
|
@@ -104,6 +109,15 @@ class Fooman_EmailAttachments_Model_Selftester extends Fooman_Common_Model_Selft
|
|
| 104 |
Mage::getConfig()->getModuleDir('', 'Mage_Core') . DS . 'Model' . DS . 'Email' . DS . 'Queue.php'
|
| 105 |
);
|
| 106 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 107 |
}
|
| 108 |
|
| 109 |
|
| 54 |
'app/code/community/Fooman/EmailAttachments/Block/Adminhtml/Extensioninfo.php',
|
| 55 |
'app/code/community/Fooman/EmailAttachments/LICENSE.txt',
|
| 56 |
'app/code/community/Fooman/EmailAttachments/controllers/Customer/OrderController.php',
|
| 57 |
+
'app/code/community/Fooman/EmailAttachments/controllers/Adminhtml/EmailAttachments/OrderController.php',
|
| 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',
|
| 64 |
'app/code/community/Fooman/EmailAttachments/Model/Order/Pdf/Order.php',
|
| 65 |
'app/code/community/Fooman/EmailAttachments/Model/Selftester.php',
|
| 66 |
'app/code/community/Fooman/EmailAttachments/Model/Observer.php',
|
| 78 |
'app/locale/sl_SI/Fooman_EmailAttachments.csv',
|
| 79 |
'app/locale/ca_ES/Fooman_EmailAttachments.csv',
|
| 80 |
'app/locale/es_ES/Fooman_EmailAttachments.csv',
|
| 81 |
+
'app/locale/tr_TR/Fooman_EmailAttachments.csv',
|
| 82 |
'app/locale/ar_SA/Fooman_EmailAttachments.csv',
|
| 83 |
'app/locale/lt_LT/Fooman_EmailAttachments.csv',
|
| 84 |
'app/locale/th_TH/Fooman_EmailAttachments.csv',
|
| 89 |
'app/locale/ru_RU/Fooman_EmailAttachments.csv',
|
| 90 |
'app/locale/lv_LV/Fooman_EmailAttachments.csv',
|
| 91 |
'app/locale/fi_FI/Fooman_EmailAttachments.csv',
|
| 92 |
+
'app/locale/en_US/template/email/sales/order_new_packingslip.html',
|
| 93 |
'app/locale/en_US/Fooman_EmailAttachments.csv',
|
| 94 |
'app/locale/ro_RO/Fooman_EmailAttachments.csv',
|
| 95 |
'app/locale/de_DE/Fooman_EmailAttachments.csv',
|
| 109 |
Mage::getConfig()->getModuleDir('', 'Mage_Core') . DS . 'Model' . DS . 'Email' . DS . 'Queue.php'
|
| 110 |
);
|
| 111 |
}
|
| 112 |
+
|
| 113 |
+
public function _needsCron()
|
| 114 |
+
{
|
| 115 |
+
if ($this->_hasQueueSupport()) {
|
| 116 |
+
return true;
|
| 117 |
+
} else {
|
| 118 |
+
return false;
|
| 119 |
+
}
|
| 120 |
+
}
|
| 121 |
}
|
| 122 |
|
| 123 |
|
app/code/community/Fooman/EmailAttachments/controllers/Adminhtml/EmailAttachments/OrderController.php
ADDED
|
@@ -0,0 +1,86 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
require_once BP . '/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php';
|
| 3 |
+
|
| 4 |
+
/**
|
| 5 |
+
* @author Kristof Ringleff
|
| 6 |
+
* @package Fooman_EmailAttachments
|
| 7 |
+
* @copyright Copyright (c) 2009 Fooman Limited (http://www.fooman.co.nz)
|
| 8 |
+
*
|
| 9 |
+
* For the full copyright and license information, please view the LICENSE
|
| 10 |
+
* file that was distributed with this source code.
|
| 11 |
+
*/
|
| 12 |
+
|
| 13 |
+
class Fooman_EmailAttachments_Adminhtml_EmailAttachments_OrderController extends Mage_Adminhtml_Sales_OrderController
|
| 14 |
+
{
|
| 15 |
+
|
| 16 |
+
/**
|
| 17 |
+
* send order pdfs for given order_id
|
| 18 |
+
*
|
| 19 |
+
* @return Mage_Core_Controller_Varien_Action
|
| 20 |
+
*/
|
| 21 |
+
public function printAction()
|
| 22 |
+
{
|
| 23 |
+
$orderId = $this->getRequest()->getParam('order_id');
|
| 24 |
+
if ($orderId) {
|
| 25 |
+
/* @var $order Mage_Sales_Model_Order */
|
| 26 |
+
$order = Mage::getModel('sales/order')->load($orderId);
|
| 27 |
+
if ($order) {
|
| 28 |
+
if ($order->getStoreId()) {
|
| 29 |
+
Mage::app()->setCurrentStore($order->getStoreId());
|
| 30 |
+
}
|
| 31 |
+
$pdf = Mage::getModel('emailattachments/order_pdf_order')->getPdf(array($order));
|
| 32 |
+
|
| 33 |
+
return $this->_prepareDownloadResponse(
|
| 34 |
+
'order' . Mage::getSingleton('core/date')->date('Y-m-d_H-i-s') . '.pdf',
|
| 35 |
+
$pdf->render(),
|
| 36 |
+
'application/pdf'
|
| 37 |
+
);
|
| 38 |
+
}
|
| 39 |
+
} else {
|
| 40 |
+
$this->_getSession()->addError(
|
| 41 |
+
$this->__('There are no printable documents related to selected orders')
|
| 42 |
+
);
|
| 43 |
+
}
|
| 44 |
+
$this->_redirect('*/*/');
|
| 45 |
+
}
|
| 46 |
+
|
| 47 |
+
/**
|
| 48 |
+
* send order pdfs for given order_ids
|
| 49 |
+
*
|
| 50 |
+
* @return Mage_Core_Controller_Varien_Action
|
| 51 |
+
*/
|
| 52 |
+
public function pdfordersAction()
|
| 53 |
+
{
|
| 54 |
+
$orderIds = $this->getRequest()->getPost('order_ids');
|
| 55 |
+
$flag = false;
|
| 56 |
+
if (!empty($orderIds)) {
|
| 57 |
+
foreach ($orderIds as $orderId) {
|
| 58 |
+
/* @var $order Mage_Sales_Model_Order */
|
| 59 |
+
$order = Mage::getModel('sales/order')->load($orderId);
|
| 60 |
+
if ($order->getId()) {
|
| 61 |
+
$flag = true;
|
| 62 |
+
if (!isset($pdf)) {
|
| 63 |
+
$pdf = Mage::getModel('emailattachments/order_pdf_order')
|
| 64 |
+
->getPdf(array($order));
|
| 65 |
+
} else {
|
| 66 |
+
$pages = Mage::getModel('emailattachments/order_pdf_order')
|
| 67 |
+
->getPdf(array($order));
|
| 68 |
+
$pdf->pages = array_merge($pdf->pages, $pages->pages);
|
| 69 |
+
}
|
| 70 |
+
}
|
| 71 |
+
}
|
| 72 |
+
}
|
| 73 |
+
if ($flag) {
|
| 74 |
+
return $this->_prepareDownloadResponse(
|
| 75 |
+
'order' . Mage::getSingleton('core/date')->date('Y-m-d_H-i-s') . '.pdf',
|
| 76 |
+
$pdf->render(),
|
| 77 |
+
'application/pdf'
|
| 78 |
+
);
|
| 79 |
+
} else {
|
| 80 |
+
$this->_getSession()->addError(
|
| 81 |
+
$this->__('There are no printable documents related to selected orders')
|
| 82 |
+
);
|
| 83 |
+
}
|
| 84 |
+
$this->_redirect('*/*');
|
| 85 |
+
}
|
| 86 |
+
}
|
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>
|
|
@@ -30,6 +30,7 @@
|
|
| 30 |
<order>
|
| 31 |
<default>sales/order_pdf_items_invoice_default</default>
|
| 32 |
<grouped>sales/order_pdf_items_invoice_grouped</grouped>
|
|
|
|
| 33 |
</order>
|
| 34 |
</pdf>
|
| 35 |
<helpers>
|
|
@@ -47,6 +48,15 @@
|
|
| 47 |
</fooman_emailattachments_before_send_queue>
|
| 48 |
</observers>
|
| 49 |
</fooman_emailattachments_before_send_queue>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 50 |
<fooman_emailattachments_before_send_order>
|
| 51 |
<observers>
|
| 52 |
<fooman_emailattachments_before_send_order>
|
|
@@ -123,13 +133,13 @@
|
|
| 123 |
</adminhtml>
|
| 124 |
<admin>
|
| 125 |
<routers>
|
| 126 |
-
<
|
| 127 |
-
<use>admin</use>
|
| 128 |
<args>
|
| 129 |
-
<
|
| 130 |
-
|
|
|
|
| 131 |
</args>
|
| 132 |
-
</
|
| 133 |
</routers>
|
| 134 |
</admin>
|
| 135 |
<default>
|
|
@@ -180,7 +190,7 @@
|
|
| 180 |
<phpunit>
|
| 181 |
<suite>
|
| 182 |
<modules>
|
| 183 |
-
<Fooman_EmailAttachments
|
| 184 |
</modules>
|
| 185 |
</suite>
|
| 186 |
</phpunit>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Fooman_EmailAttachments>
|
| 5 |
+
<version>0.11.2</version>
|
| 6 |
<depends>
|
| 7 |
</depends>
|
| 8 |
</Fooman_EmailAttachments>
|
| 30 |
<order>
|
| 31 |
<default>sales/order_pdf_items_invoice_default</default>
|
| 32 |
<grouped>sales/order_pdf_items_invoice_grouped</grouped>
|
| 33 |
+
<bundle>emailattachments/order_pdf_bundleItems</bundle>
|
| 34 |
</order>
|
| 35 |
</pdf>
|
| 36 |
<helpers>
|
| 48 |
</fooman_emailattachments_before_send_queue>
|
| 49 |
</observers>
|
| 50 |
</fooman_emailattachments_before_send_queue>
|
| 51 |
+
<aschroder_smtppro_queue_before_send>
|
| 52 |
+
<observers>
|
| 53 |
+
<fooman_emailattachments_before_send_queue>
|
| 54 |
+
<type>singleton</type>
|
| 55 |
+
<class>emailattachments/observer</class>
|
| 56 |
+
<method>beforeSendQueuedOrder</method>
|
| 57 |
+
</fooman_emailattachments_before_send_queue>
|
| 58 |
+
</observers>
|
| 59 |
+
</aschroder_smtppro_queue_before_send>
|
| 60 |
<fooman_emailattachments_before_send_order>
|
| 61 |
<observers>
|
| 62 |
<fooman_emailattachments_before_send_order>
|
| 133 |
</adminhtml>
|
| 134 |
<admin>
|
| 135 |
<routers>
|
| 136 |
+
<adminhtml>
|
|
|
|
| 137 |
<args>
|
| 138 |
+
<modules>
|
| 139 |
+
<emailattachments after="Mage_Adminhtml">Fooman_EmailAttachments_Adminhtml</emailattachments>
|
| 140 |
+
</modules>
|
| 141 |
</args>
|
| 142 |
+
</adminhtml>
|
| 143 |
</routers>
|
| 144 |
</admin>
|
| 145 |
<default>
|
| 190 |
<phpunit>
|
| 191 |
<suite>
|
| 192 |
<modules>
|
| 193 |
+
<Fooman_EmailAttachments/>
|
| 194 |
</modules>
|
| 195 |
</suite>
|
| 196 |
</phpunit>
|
app/code/community/Fooman/EmailAttachments/etc/system.xml
CHANGED
|
@@ -21,7 +21,7 @@
|
|
| 21 |
<sales_email>
|
| 22 |
<groups>
|
| 23 |
<order>
|
| 24 |
-
|
| 25 |
<attachpdf translate="label">
|
| 26 |
<label>Attach Order as PDF</label>
|
| 27 |
<tooltip>When set to Yes, your invoice pdf document will be
|
|
@@ -45,52 +45,100 @@
|
|
| 45 |
<show_in_website>1</show_in_website>
|
| 46 |
<show_in_store>1</show_in_store>
|
| 47 |
</attachagreement>
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 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 |
-
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
|
| 90 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 91 |
</order>
|
| 92 |
<order_comment>
|
| 93 |
-
|
| 94 |
<attachpdf translate="label">
|
| 95 |
<label>Attach Order as PDF</label>
|
| 96 |
<tooltip>When set to Yes, your invoice pdf document will be
|
|
@@ -114,22 +162,70 @@
|
|
| 114 |
<show_in_website>1</show_in_website>
|
| 115 |
<show_in_store>1</show_in_store>
|
| 116 |
</attachagreement>
|
| 117 |
-
|
| 118 |
-
|
| 119 |
-
|
| 120 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 121 |
-
|
| 122 |
-
|
| 123 |
-
|
| 124 |
-
|
| 125 |
-
|
| 126 |
-
|
| 127 |
-
|
| 128 |
-
|
| 129 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 130 |
</order_comment>
|
| 131 |
<invoice>
|
| 132 |
-
|
| 133 |
<attachpdf translate="label">
|
| 134 |
<label>Attach Invoice as PDF</label>
|
| 135 |
<tooltip>When set to Yes, your invoice pdf document will be
|
|
@@ -153,22 +249,70 @@
|
|
| 153 |
<show_in_website>1</show_in_website>
|
| 154 |
<show_in_store>1</show_in_store>
|
| 155 |
</attachagreement>
|
| 156 |
-
|
| 157 |
-
|
| 158 |
-
|
| 159 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 160 |
-
|
| 161 |
-
|
| 162 |
-
|
| 163 |
-
|
| 164 |
-
|
| 165 |
-
|
| 166 |
-
|
| 167 |
-
|
| 168 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 169 |
</invoice>
|
| 170 |
<invoice_comment>
|
| 171 |
-
|
| 172 |
<attachpdf translate="label">
|
| 173 |
<label>Attach Invoice as PDF</label>
|
| 174 |
<tooltip>When set to Yes, your invoice pdf document will be
|
|
@@ -192,22 +336,70 @@
|
|
| 192 |
<show_in_website>1</show_in_website>
|
| 193 |
<show_in_store>1</show_in_store>
|
| 194 |
</attachagreement>
|
| 195 |
-
|
| 196 |
-
|
| 197 |
-
|
| 198 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 199 |
-
|
| 200 |
-
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
-
|
| 206 |
-
|
| 207 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 208 |
</invoice_comment>
|
| 209 |
<shipment>
|
| 210 |
-
|
| 211 |
<attachpdf translate="label">
|
| 212 |
<label>Attach Packing Slip as PDF</label>
|
| 213 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
|
@@ -231,22 +423,70 @@
|
|
| 231 |
<show_in_website>1</show_in_website>
|
| 232 |
<show_in_store>1</show_in_store>
|
| 233 |
</attachagreement>
|
| 234 |
-
|
| 235 |
-
|
| 236 |
-
|
| 237 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 238 |
-
|
| 239 |
-
|
| 240 |
-
|
| 241 |
-
|
| 242 |
-
|
| 243 |
-
|
| 244 |
-
|
| 245 |
-
|
| 246 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 247 |
</shipment>
|
| 248 |
<shipment_comment>
|
| 249 |
-
|
| 250 |
<attachpdf translate="label">
|
| 251 |
<label>Attach Packing Slip as PDF</label>
|
| 252 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
|
@@ -270,22 +510,70 @@
|
|
| 270 |
<show_in_website>1</show_in_website>
|
| 271 |
<show_in_store>1</show_in_store>
|
| 272 |
</attachagreement>
|
| 273 |
-
|
| 274 |
-
|
| 275 |
-
|
| 276 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 277 |
-
|
| 278 |
-
|
| 279 |
-
|
| 280 |
-
|
| 281 |
-
|
| 282 |
-
|
| 283 |
-
|
| 284 |
-
|
| 285 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 286 |
</shipment_comment>
|
| 287 |
<creditmemo>
|
| 288 |
-
|
| 289 |
<attachpdf translate="label">
|
| 290 |
<label>Attach Credit Memo as PDF</label>
|
| 291 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
|
@@ -309,22 +597,70 @@
|
|
| 309 |
<show_in_website>1</show_in_website>
|
| 310 |
<show_in_store>1</show_in_store>
|
| 311 |
</attachagreement>
|
| 312 |
-
|
| 313 |
-
|
| 314 |
-
|
| 315 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 316 |
-
|
| 317 |
-
|
| 318 |
-
|
| 319 |
-
|
| 320 |
-
|
| 321 |
-
|
| 322 |
-
|
| 323 |
-
|
| 324 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 325 |
</creditmemo>
|
| 326 |
<creditmemo_comment>
|
| 327 |
-
|
| 328 |
<attachpdf translate="label">
|
| 329 |
<label>Attach Credit Memo as PDF</label>
|
| 330 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
|
@@ -348,24 +684,69 @@
|
|
| 348 |
<show_in_website>1</show_in_website>
|
| 349 |
<show_in_store>1</show_in_store>
|
| 350 |
</attachagreement>
|
| 351 |
-
|
| 352 |
-
|
| 353 |
-
|
| 354 |
-
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 355 |
-
|
| 356 |
-
|
| 357 |
-
|
| 358 |
-
|
| 359 |
-
|
| 360 |
-
|
| 361 |
-
|
| 362 |
-
|
| 363 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 364 |
</creditmemo_comment>
|
| 365 |
</groups>
|
| 366 |
</sales_email>
|
| 367 |
-
|
| 368 |
</config>
|
| 369 |
-
|
| 370 |
-
|
| 371 |
-
|
| 21 |
<sales_email>
|
| 22 |
<groups>
|
| 23 |
<order>
|
| 24 |
+
<fields>
|
| 25 |
<attachpdf translate="label">
|
| 26 |
<label>Attach Order as PDF</label>
|
| 27 |
<tooltip>When set to Yes, your invoice pdf document will be
|
| 45 |
<show_in_website>1</show_in_website>
|
| 46 |
<show_in_store>1</show_in_store>
|
| 47 |
</attachagreement>
|
| 48 |
+
<attachfile_1 translate="label">
|
| 49 |
+
<label>Attach Pdf File</label>
|
| 50 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 51 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 52 |
+
<frontend_type>file</frontend_type>
|
| 53 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 54 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 55 |
+
<sort_order>75</sort_order>
|
| 56 |
+
<show_in_default>1</show_in_default>
|
| 57 |
+
<show_in_website>1</show_in_website>
|
| 58 |
+
<show_in_store>1</show_in_store>
|
| 59 |
+
</attachfile_1>
|
| 60 |
+
<attachfile_2 translate="label">
|
| 61 |
+
<label>Attach Pdf File</label>
|
| 62 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 63 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 64 |
+
<frontend_type>file</frontend_type>
|
| 65 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 66 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 67 |
+
<sort_order>75</sort_order>
|
| 68 |
+
<show_in_default>1</show_in_default>
|
| 69 |
+
<show_in_website>1</show_in_website>
|
| 70 |
+
<show_in_store>1</show_in_store>
|
| 71 |
+
</attachfile_2>
|
| 72 |
+
<attachfile_3 translate="label">
|
| 73 |
+
<label>Attach Pdf File</label>
|
| 74 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 75 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 76 |
+
<frontend_type>file</frontend_type>
|
| 77 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 78 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 79 |
+
<sort_order>75</sort_order>
|
| 80 |
+
<show_in_default>1</show_in_default>
|
| 81 |
+
<show_in_website>1</show_in_website>
|
| 82 |
+
<show_in_store>1</show_in_store>
|
| 83 |
+
</attachfile_3>
|
| 84 |
+
<attachfile_4 translate="label">
|
| 85 |
+
<label>Attach Pdf File</label>
|
| 86 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 87 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 88 |
+
<frontend_type>file</frontend_type>
|
| 89 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 90 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 91 |
+
<sort_order>75</sort_order>
|
| 92 |
+
<show_in_default>1</show_in_default>
|
| 93 |
+
<show_in_website>1</show_in_website>
|
| 94 |
+
<show_in_store>1</show_in_store>
|
| 95 |
+
</attachfile_4>
|
| 96 |
+
<attachfile_5 translate="label">
|
| 97 |
+
<label>Attach Pdf File</label>
|
| 98 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 99 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 100 |
+
<frontend_type>file</frontend_type>
|
| 101 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 102 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 103 |
+
<sort_order>75</sort_order>
|
| 104 |
+
<show_in_default>1</show_in_default>
|
| 105 |
+
<show_in_website>1</show_in_website>
|
| 106 |
+
<show_in_store>1</show_in_store>
|
| 107 |
+
</attachfile_5>
|
| 108 |
+
<sendpackingslip translate="label">
|
| 109 |
+
<if_module_enabled>Fooman_PdfCustomiser</if_module_enabled>
|
| 110 |
+
<label>Send Packing Slip</label>
|
| 111 |
+
<frontend_type>select</frontend_type>
|
| 112 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 113 |
+
<sort_order>85</sort_order>
|
| 114 |
+
<show_in_default>1</show_in_default>
|
| 115 |
+
<show_in_website>1</show_in_website>
|
| 116 |
+
<show_in_store>1</show_in_store>
|
| 117 |
+
</sendpackingslip>
|
| 118 |
+
<shipment_template translate="label">
|
| 119 |
+
<if_module_enabled>Fooman_PdfCustomiser</if_module_enabled>
|
| 120 |
+
<label>Packingslip Template</label>
|
| 121 |
+
<frontend_type>select</frontend_type>
|
| 122 |
+
<source_model>adminhtml/system_config_source_email_template</source_model>
|
| 123 |
+
<sort_order>86</sort_order>
|
| 124 |
+
<show_in_default>1</show_in_default>
|
| 125 |
+
<show_in_website>1</show_in_website>
|
| 126 |
+
<show_in_store>1</show_in_store>
|
| 127 |
+
</shipment_template>
|
| 128 |
+
<shipment_to translate="label comment">
|
| 129 |
+
<if_module_enabled>Fooman_PdfCustomiser</if_module_enabled>
|
| 130 |
+
<label>Send Packingslip To</label>
|
| 131 |
+
<frontend_type>text</frontend_type>
|
| 132 |
+
<sort_order>87</sort_order>
|
| 133 |
+
<show_in_default>1</show_in_default>
|
| 134 |
+
<show_in_website>1</show_in_website>
|
| 135 |
+
<show_in_store>1</show_in_store>
|
| 136 |
+
<comment>Comma-separated.</comment>
|
| 137 |
+
</shipment_to>
|
| 138 |
+
</fields>
|
| 139 |
</order>
|
| 140 |
<order_comment>
|
| 141 |
+
<fields>
|
| 142 |
<attachpdf translate="label">
|
| 143 |
<label>Attach Order as PDF</label>
|
| 144 |
<tooltip>When set to Yes, your invoice pdf document will be
|
| 162 |
<show_in_website>1</show_in_website>
|
| 163 |
<show_in_store>1</show_in_store>
|
| 164 |
</attachagreement>
|
| 165 |
+
<attachfile_1 translate="label">
|
| 166 |
+
<label>Attach Pdf File</label>
|
| 167 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 168 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 169 |
+
<frontend_type>file</frontend_type>
|
| 170 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 171 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 172 |
+
<sort_order>75</sort_order>
|
| 173 |
+
<show_in_default>1</show_in_default>
|
| 174 |
+
<show_in_website>1</show_in_website>
|
| 175 |
+
<show_in_store>1</show_in_store>
|
| 176 |
+
</attachfile_1>
|
| 177 |
+
<attachfile_2 translate="label">
|
| 178 |
+
<label>Attach Pdf File</label>
|
| 179 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 180 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 181 |
+
<frontend_type>file</frontend_type>
|
| 182 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 183 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 184 |
+
<sort_order>75</sort_order>
|
| 185 |
+
<show_in_default>1</show_in_default>
|
| 186 |
+
<show_in_website>1</show_in_website>
|
| 187 |
+
<show_in_store>1</show_in_store>
|
| 188 |
+
</attachfile_2>
|
| 189 |
+
<attachfile_3 translate="label">
|
| 190 |
+
<label>Attach Pdf File</label>
|
| 191 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 192 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 193 |
+
<frontend_type>file</frontend_type>
|
| 194 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 195 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 196 |
+
<sort_order>75</sort_order>
|
| 197 |
+
<show_in_default>1</show_in_default>
|
| 198 |
+
<show_in_website>1</show_in_website>
|
| 199 |
+
<show_in_store>1</show_in_store>
|
| 200 |
+
</attachfile_3>
|
| 201 |
+
<attachfile_4 translate="label">
|
| 202 |
+
<label>Attach Pdf File</label>
|
| 203 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 204 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 205 |
+
<frontend_type>file</frontend_type>
|
| 206 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 207 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 208 |
+
<sort_order>75</sort_order>
|
| 209 |
+
<show_in_default>1</show_in_default>
|
| 210 |
+
<show_in_website>1</show_in_website>
|
| 211 |
+
<show_in_store>1</show_in_store>
|
| 212 |
+
</attachfile_4>
|
| 213 |
+
<attachfile_5 translate="label">
|
| 214 |
+
<label>Attach Pdf File</label>
|
| 215 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 216 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 217 |
+
<frontend_type>file</frontend_type>
|
| 218 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 219 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 220 |
+
<sort_order>75</sort_order>
|
| 221 |
+
<show_in_default>1</show_in_default>
|
| 222 |
+
<show_in_website>1</show_in_website>
|
| 223 |
+
<show_in_store>1</show_in_store>
|
| 224 |
+
</attachfile_5>
|
| 225 |
+
</fields>
|
| 226 |
</order_comment>
|
| 227 |
<invoice>
|
| 228 |
+
<fields>
|
| 229 |
<attachpdf translate="label">
|
| 230 |
<label>Attach Invoice as PDF</label>
|
| 231 |
<tooltip>When set to Yes, your invoice pdf document will be
|
| 249 |
<show_in_website>1</show_in_website>
|
| 250 |
<show_in_store>1</show_in_store>
|
| 251 |
</attachagreement>
|
| 252 |
+
<attachfile_1 translate="label">
|
| 253 |
+
<label>Attach Pdf File</label>
|
| 254 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 255 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 256 |
+
<frontend_type>file</frontend_type>
|
| 257 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 258 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 259 |
+
<sort_order>75</sort_order>
|
| 260 |
+
<show_in_default>1</show_in_default>
|
| 261 |
+
<show_in_website>1</show_in_website>
|
| 262 |
+
<show_in_store>1</show_in_store>
|
| 263 |
+
</attachfile_1>
|
| 264 |
+
<attachfile_2 translate="label">
|
| 265 |
+
<label>Attach Pdf File</label>
|
| 266 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 267 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 268 |
+
<frontend_type>file</frontend_type>
|
| 269 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 270 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 271 |
+
<sort_order>75</sort_order>
|
| 272 |
+
<show_in_default>1</show_in_default>
|
| 273 |
+
<show_in_website>1</show_in_website>
|
| 274 |
+
<show_in_store>1</show_in_store>
|
| 275 |
+
</attachfile_2>
|
| 276 |
+
<attachfile_3 translate="label">
|
| 277 |
+
<label>Attach Pdf File</label>
|
| 278 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 279 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 280 |
+
<frontend_type>file</frontend_type>
|
| 281 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 282 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 283 |
+
<sort_order>75</sort_order>
|
| 284 |
+
<show_in_default>1</show_in_default>
|
| 285 |
+
<show_in_website>1</show_in_website>
|
| 286 |
+
<show_in_store>1</show_in_store>
|
| 287 |
+
</attachfile_3>
|
| 288 |
+
<attachfile_4 translate="label">
|
| 289 |
+
<label>Attach Pdf File</label>
|
| 290 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 291 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 292 |
+
<frontend_type>file</frontend_type>
|
| 293 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 294 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 295 |
+
<sort_order>75</sort_order>
|
| 296 |
+
<show_in_default>1</show_in_default>
|
| 297 |
+
<show_in_website>1</show_in_website>
|
| 298 |
+
<show_in_store>1</show_in_store>
|
| 299 |
+
</attachfile_4>
|
| 300 |
+
<attachfile_5 translate="label">
|
| 301 |
+
<label>Attach Pdf File</label>
|
| 302 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 303 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 304 |
+
<frontend_type>file</frontend_type>
|
| 305 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 306 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 307 |
+
<sort_order>75</sort_order>
|
| 308 |
+
<show_in_default>1</show_in_default>
|
| 309 |
+
<show_in_website>1</show_in_website>
|
| 310 |
+
<show_in_store>1</show_in_store>
|
| 311 |
+
</attachfile_5>
|
| 312 |
+
</fields>
|
| 313 |
</invoice>
|
| 314 |
<invoice_comment>
|
| 315 |
+
<fields>
|
| 316 |
<attachpdf translate="label">
|
| 317 |
<label>Attach Invoice as PDF</label>
|
| 318 |
<tooltip>When set to Yes, your invoice pdf document will be
|
| 336 |
<show_in_website>1</show_in_website>
|
| 337 |
<show_in_store>1</show_in_store>
|
| 338 |
</attachagreement>
|
| 339 |
+
<attachfile_1 translate="label">
|
| 340 |
+
<label>Attach Pdf File</label>
|
| 341 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 342 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 343 |
+
<frontend_type>file</frontend_type>
|
| 344 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 345 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 346 |
+
<sort_order>75</sort_order>
|
| 347 |
+
<show_in_default>1</show_in_default>
|
| 348 |
+
<show_in_website>1</show_in_website>
|
| 349 |
+
<show_in_store>1</show_in_store>
|
| 350 |
+
</attachfile_1>
|
| 351 |
+
<attachfile_2 translate="label">
|
| 352 |
+
<label>Attach Pdf File</label>
|
| 353 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 354 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 355 |
+
<frontend_type>file</frontend_type>
|
| 356 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 357 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 358 |
+
<sort_order>75</sort_order>
|
| 359 |
+
<show_in_default>1</show_in_default>
|
| 360 |
+
<show_in_website>1</show_in_website>
|
| 361 |
+
<show_in_store>1</show_in_store>
|
| 362 |
+
</attachfile_2>
|
| 363 |
+
<attachfile_3 translate="label">
|
| 364 |
+
<label>Attach Pdf File</label>
|
| 365 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 366 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 367 |
+
<frontend_type>file</frontend_type>
|
| 368 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 369 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 370 |
+
<sort_order>75</sort_order>
|
| 371 |
+
<show_in_default>1</show_in_default>
|
| 372 |
+
<show_in_website>1</show_in_website>
|
| 373 |
+
<show_in_store>1</show_in_store>
|
| 374 |
+
</attachfile_3>
|
| 375 |
+
<attachfile_4 translate="label">
|
| 376 |
+
<label>Attach Pdf File</label>
|
| 377 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 378 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 379 |
+
<frontend_type>file</frontend_type>
|
| 380 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 381 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 382 |
+
<sort_order>75</sort_order>
|
| 383 |
+
<show_in_default>1</show_in_default>
|
| 384 |
+
<show_in_website>1</show_in_website>
|
| 385 |
+
<show_in_store>1</show_in_store>
|
| 386 |
+
</attachfile_4>
|
| 387 |
+
<attachfile_5 translate="label">
|
| 388 |
+
<label>Attach Pdf File</label>
|
| 389 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 390 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 391 |
+
<frontend_type>file</frontend_type>
|
| 392 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 393 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 394 |
+
<sort_order>75</sort_order>
|
| 395 |
+
<show_in_default>1</show_in_default>
|
| 396 |
+
<show_in_website>1</show_in_website>
|
| 397 |
+
<show_in_store>1</show_in_store>
|
| 398 |
+
</attachfile_5>
|
| 399 |
+
</fields>
|
| 400 |
</invoice_comment>
|
| 401 |
<shipment>
|
| 402 |
+
<fields>
|
| 403 |
<attachpdf translate="label">
|
| 404 |
<label>Attach Packing Slip as PDF</label>
|
| 405 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
| 423 |
<show_in_website>1</show_in_website>
|
| 424 |
<show_in_store>1</show_in_store>
|
| 425 |
</attachagreement>
|
| 426 |
+
<attachfile_1 translate="label">
|
| 427 |
+
<label>Attach Pdf File</label>
|
| 428 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 429 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 430 |
+
<frontend_type>file</frontend_type>
|
| 431 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 432 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 433 |
+
<sort_order>75</sort_order>
|
| 434 |
+
<show_in_default>1</show_in_default>
|
| 435 |
+
<show_in_website>1</show_in_website>
|
| 436 |
+
<show_in_store>1</show_in_store>
|
| 437 |
+
</attachfile_1>
|
| 438 |
+
<attachfile_2 translate="label">
|
| 439 |
+
<label>Attach Pdf File</label>
|
| 440 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 441 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 442 |
+
<frontend_type>file</frontend_type>
|
| 443 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 444 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 445 |
+
<sort_order>75</sort_order>
|
| 446 |
+
<show_in_default>1</show_in_default>
|
| 447 |
+
<show_in_website>1</show_in_website>
|
| 448 |
+
<show_in_store>1</show_in_store>
|
| 449 |
+
</attachfile_2>
|
| 450 |
+
<attachfile_3 translate="label">
|
| 451 |
+
<label>Attach Pdf File</label>
|
| 452 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 453 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 454 |
+
<frontend_type>file</frontend_type>
|
| 455 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 456 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 457 |
+
<sort_order>75</sort_order>
|
| 458 |
+
<show_in_default>1</show_in_default>
|
| 459 |
+
<show_in_website>1</show_in_website>
|
| 460 |
+
<show_in_store>1</show_in_store>
|
| 461 |
+
</attachfile_3>
|
| 462 |
+
<attachfile_4 translate="label">
|
| 463 |
+
<label>Attach Pdf File</label>
|
| 464 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 465 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 466 |
+
<frontend_type>file</frontend_type>
|
| 467 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 468 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 469 |
+
<sort_order>75</sort_order>
|
| 470 |
+
<show_in_default>1</show_in_default>
|
| 471 |
+
<show_in_website>1</show_in_website>
|
| 472 |
+
<show_in_store>1</show_in_store>
|
| 473 |
+
</attachfile_4>
|
| 474 |
+
<attachfile_5 translate="label">
|
| 475 |
+
<label>Attach Pdf File</label>
|
| 476 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 477 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 478 |
+
<frontend_type>file</frontend_type>
|
| 479 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 480 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 481 |
+
<sort_order>75</sort_order>
|
| 482 |
+
<show_in_default>1</show_in_default>
|
| 483 |
+
<show_in_website>1</show_in_website>
|
| 484 |
+
<show_in_store>1</show_in_store>
|
| 485 |
+
</attachfile_5>
|
| 486 |
+
</fields>
|
| 487 |
</shipment>
|
| 488 |
<shipment_comment>
|
| 489 |
+
<fields>
|
| 490 |
<attachpdf translate="label">
|
| 491 |
<label>Attach Packing Slip as PDF</label>
|
| 492 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
| 510 |
<show_in_website>1</show_in_website>
|
| 511 |
<show_in_store>1</show_in_store>
|
| 512 |
</attachagreement>
|
| 513 |
+
<attachfile_1 translate="label">
|
| 514 |
+
<label>Attach Pdf File</label>
|
| 515 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 516 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 517 |
+
<frontend_type>file</frontend_type>
|
| 518 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 519 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 520 |
+
<sort_order>75</sort_order>
|
| 521 |
+
<show_in_default>1</show_in_default>
|
| 522 |
+
<show_in_website>1</show_in_website>
|
| 523 |
+
<show_in_store>1</show_in_store>
|
| 524 |
+
</attachfile_1>
|
| 525 |
+
<attachfile_2 translate="label">
|
| 526 |
+
<label>Attach Pdf File</label>
|
| 527 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 528 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 529 |
+
<frontend_type>file</frontend_type>
|
| 530 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 531 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 532 |
+
<sort_order>75</sort_order>
|
| 533 |
+
<show_in_default>1</show_in_default>
|
| 534 |
+
<show_in_website>1</show_in_website>
|
| 535 |
+
<show_in_store>1</show_in_store>
|
| 536 |
+
</attachfile_2>
|
| 537 |
+
<attachfile_3 translate="label">
|
| 538 |
+
<label>Attach Pdf File</label>
|
| 539 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 540 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 541 |
+
<frontend_type>file</frontend_type>
|
| 542 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 543 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 544 |
+
<sort_order>75</sort_order>
|
| 545 |
+
<show_in_default>1</show_in_default>
|
| 546 |
+
<show_in_website>1</show_in_website>
|
| 547 |
+
<show_in_store>1</show_in_store>
|
| 548 |
+
</attachfile_3>
|
| 549 |
+
<attachfile_4 translate="label">
|
| 550 |
+
<label>Attach Pdf File</label>
|
| 551 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 552 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 553 |
+
<frontend_type>file</frontend_type>
|
| 554 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 555 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 556 |
+
<sort_order>75</sort_order>
|
| 557 |
+
<show_in_default>1</show_in_default>
|
| 558 |
+
<show_in_website>1</show_in_website>
|
| 559 |
+
<show_in_store>1</show_in_store>
|
| 560 |
+
</attachfile_4>
|
| 561 |
+
<attachfile_5 translate="label">
|
| 562 |
+
<label>Attach Pdf File</label>
|
| 563 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 564 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 565 |
+
<frontend_type>file</frontend_type>
|
| 566 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 567 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 568 |
+
<sort_order>75</sort_order>
|
| 569 |
+
<show_in_default>1</show_in_default>
|
| 570 |
+
<show_in_website>1</show_in_website>
|
| 571 |
+
<show_in_store>1</show_in_store>
|
| 572 |
+
</attachfile_5>
|
| 573 |
+
</fields>
|
| 574 |
</shipment_comment>
|
| 575 |
<creditmemo>
|
| 576 |
+
<fields>
|
| 577 |
<attachpdf translate="label">
|
| 578 |
<label>Attach Credit Memo as PDF</label>
|
| 579 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
| 597 |
<show_in_website>1</show_in_website>
|
| 598 |
<show_in_store>1</show_in_store>
|
| 599 |
</attachagreement>
|
| 600 |
+
<attachfile_1 translate="label">
|
| 601 |
+
<label>Attach Pdf File</label>
|
| 602 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 603 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 604 |
+
<frontend_type>file</frontend_type>
|
| 605 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 606 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 607 |
+
<sort_order>75</sort_order>
|
| 608 |
+
<show_in_default>1</show_in_default>
|
| 609 |
+
<show_in_website>1</show_in_website>
|
| 610 |
+
<show_in_store>1</show_in_store>
|
| 611 |
+
</attachfile_1>
|
| 612 |
+
<attachfile_2 translate="label">
|
| 613 |
+
<label>Attach Pdf File</label>
|
| 614 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 615 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 616 |
+
<frontend_type>file</frontend_type>
|
| 617 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 618 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 619 |
+
<sort_order>75</sort_order>
|
| 620 |
+
<show_in_default>1</show_in_default>
|
| 621 |
+
<show_in_website>1</show_in_website>
|
| 622 |
+
<show_in_store>1</show_in_store>
|
| 623 |
+
</attachfile_2>
|
| 624 |
+
<attachfile_3 translate="label">
|
| 625 |
+
<label>Attach Pdf File</label>
|
| 626 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 627 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 628 |
+
<frontend_type>file</frontend_type>
|
| 629 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 630 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 631 |
+
<sort_order>75</sort_order>
|
| 632 |
+
<show_in_default>1</show_in_default>
|
| 633 |
+
<show_in_website>1</show_in_website>
|
| 634 |
+
<show_in_store>1</show_in_store>
|
| 635 |
+
</attachfile_3>
|
| 636 |
+
<attachfile_4 translate="label">
|
| 637 |
+
<label>Attach Pdf File</label>
|
| 638 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 639 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 640 |
+
<frontend_type>file</frontend_type>
|
| 641 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 642 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 643 |
+
<sort_order>75</sort_order>
|
| 644 |
+
<show_in_default>1</show_in_default>
|
| 645 |
+
<show_in_website>1</show_in_website>
|
| 646 |
+
<show_in_store>1</show_in_store>
|
| 647 |
+
</attachfile_4>
|
| 648 |
+
<attachfile_5 translate="label">
|
| 649 |
+
<label>Attach Pdf File</label>
|
| 650 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 651 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 652 |
+
<frontend_type>file</frontend_type>
|
| 653 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 654 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 655 |
+
<sort_order>75</sort_order>
|
| 656 |
+
<show_in_default>1</show_in_default>
|
| 657 |
+
<show_in_website>1</show_in_website>
|
| 658 |
+
<show_in_store>1</show_in_store>
|
| 659 |
+
</attachfile_5>
|
| 660 |
+
</fields>
|
| 661 |
</creditmemo>
|
| 662 |
<creditmemo_comment>
|
| 663 |
+
<fields>
|
| 664 |
<attachpdf translate="label">
|
| 665 |
<label>Attach Credit Memo as PDF</label>
|
| 666 |
<tooltip>When set to Yes, your packing slip pdf document will be
|
| 684 |
<show_in_website>1</show_in_website>
|
| 685 |
<show_in_store>1</show_in_store>
|
| 686 |
</attachagreement>
|
| 687 |
+
<attachfile_1 translate="label">
|
| 688 |
+
<label>Attach Pdf File</label>
|
| 689 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 690 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 691 |
+
<frontend_type>file</frontend_type>
|
| 692 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 693 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 694 |
+
<sort_order>75</sort_order>
|
| 695 |
+
<show_in_default>1</show_in_default>
|
| 696 |
+
<show_in_website>1</show_in_website>
|
| 697 |
+
<show_in_store>1</show_in_store>
|
| 698 |
+
</attachfile_1>
|
| 699 |
+
<attachfile_2 translate="label">
|
| 700 |
+
<label>Attach Pdf File</label>
|
| 701 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 702 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 703 |
+
<frontend_type>file</frontend_type>
|
| 704 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 705 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 706 |
+
<sort_order>75</sort_order>
|
| 707 |
+
<show_in_default>1</show_in_default>
|
| 708 |
+
<show_in_website>1</show_in_website>
|
| 709 |
+
<show_in_store>1</show_in_store>
|
| 710 |
+
</attachfile_2>
|
| 711 |
+
<attachfile_3 translate="label">
|
| 712 |
+
<label>Attach Pdf File</label>
|
| 713 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 714 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 715 |
+
<frontend_type>file</frontend_type>
|
| 716 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 717 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 718 |
+
<sort_order>75</sort_order>
|
| 719 |
+
<show_in_default>1</show_in_default>
|
| 720 |
+
<show_in_website>1</show_in_website>
|
| 721 |
+
<show_in_store>1</show_in_store>
|
| 722 |
+
</attachfile_3>
|
| 723 |
+
<attachfile_4 translate="label">
|
| 724 |
+
<label>Attach Pdf File</label>
|
| 725 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 726 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 727 |
+
<frontend_type>file</frontend_type>
|
| 728 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 729 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 730 |
+
<sort_order>75</sort_order>
|
| 731 |
+
<show_in_default>1</show_in_default>
|
| 732 |
+
<show_in_website>1</show_in_website>
|
| 733 |
+
<show_in_store>1</show_in_store>
|
| 734 |
+
</attachfile_4>
|
| 735 |
+
<attachfile_5 translate="label">
|
| 736 |
+
<label>Attach Pdf File</label>
|
| 737 |
+
<tooltip>Choose to upload any pdf document to automatically attach to the email - for example,
|
| 738 |
+
your return policy, a coupon or voucher, your latest newsletter.</tooltip>
|
| 739 |
+
<frontend_type>file</frontend_type>
|
| 740 |
+
<upload_dir config="system/filesystem/media">pdfs</upload_dir>
|
| 741 |
+
<backend_model>emailattachments/system_file</backend_model>
|
| 742 |
+
<sort_order>75</sort_order>
|
| 743 |
+
<show_in_default>1</show_in_default>
|
| 744 |
+
<show_in_website>1</show_in_website>
|
| 745 |
+
<show_in_store>1</show_in_store>
|
| 746 |
+
</attachfile_5>
|
| 747 |
+
</fields>
|
| 748 |
</creditmemo_comment>
|
| 749 |
</groups>
|
| 750 |
</sales_email>
|
| 751 |
+
</sections>
|
| 752 |
</config>
|
|
|
|
|
|
|
|
|
app/locale/en_US/template/email/sales/order_new_packingslip.html
ADDED
|
@@ -0,0 +1,73 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<!--@subject {{var store.getFrontendName()}}: New Packingslip for Order # {{var order.increment_id}} @-->
|
| 2 |
+
<!--@vars
|
| 3 |
+
{"store url=\"\"":"Store Url",
|
| 4 |
+
"var logo_url":"Email Logo Image Url",
|
| 5 |
+
"var logo_alt":"Email Logo Image Alt",
|
| 6 |
+
"var store.getFrontendName()":"Store Name",
|
| 7 |
+
"var order.increment_id":"Order Id",
|
| 8 |
+
"var order.getCreatedAtFormated('long')":"Order Created At (datetime)",
|
| 9 |
+
"var order.getShippingAddress().format('html')":"Shipping Address",
|
| 10 |
+
"var order.getShippingDescription()":"Shipping Description",
|
| 11 |
+
"var order.getEmailCustomerNote()":"Email Order Note"}
|
| 12 |
+
@-->
|
| 13 |
+
<!--@styles
|
| 14 |
+
body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
|
| 15 |
+
@-->
|
| 16 |
+
|
| 17 |
+
<body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
|
| 18 |
+
<div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
|
| 19 |
+
<table cellspacing="0" cellpadding="0" border="0" width="100%">
|
| 20 |
+
<tr>
|
| 21 |
+
<td align="center" valign="top" style="padding:20px 0 20px 0">
|
| 22 |
+
<table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
|
| 23 |
+
<!-- [ header starts here] -->
|
| 24 |
+
<tr>
|
| 25 |
+
<td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
|
| 26 |
+
</tr>
|
| 27 |
+
<!-- [ middle starts here] -->
|
| 28 |
+
<tr>
|
| 29 |
+
<td valign="top">
|
| 30 |
+
<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">New Packingslip from {{var store.getFrontendName()}}.</h1>
|
| 31 |
+
</tr>
|
| 32 |
+
<tr>
|
| 33 |
+
<td>
|
| 34 |
+
<h2 style="font-size:18px; font-weight:normal; margin:0;">Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated('long')}})</small></h2>
|
| 35 |
+
</td>
|
| 36 |
+
</tr>
|
| 37 |
+
<tr>
|
| 38 |
+
<td>
|
| 39 |
+
<br/>
|
| 40 |
+
{{depend order.getIsNotVirtual()}}
|
| 41 |
+
<table cellspacing="0" cellpadding="0" border="0" width="650">
|
| 42 |
+
<thead>
|
| 43 |
+
<tr>
|
| 44 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
|
| 45 |
+
<th width="10"></th>
|
| 46 |
+
<th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
|
| 47 |
+
</tr>
|
| 48 |
+
</thead>
|
| 49 |
+
<tbody>
|
| 50 |
+
<tr>
|
| 51 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
| 52 |
+
{{var order.getShippingAddress().format('html')}}
|
| 53 |
+
|
| 54 |
+
</td>
|
| 55 |
+
<td> </td>
|
| 56 |
+
<td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
|
| 57 |
+
{{var order.getShippingDescription()}}
|
| 58 |
+
|
| 59 |
+
</td>
|
| 60 |
+
</tr>
|
| 61 |
+
</tbody>
|
| 62 |
+
</table>
|
| 63 |
+
<br/>
|
| 64 |
+
{{/depend}}
|
| 65 |
+
<p style="font-size:12px; margin:0 0 10px 0">{{var order.getEmailCustomerNote()}}</p>
|
| 66 |
+
</td>
|
| 67 |
+
</tr>
|
| 68 |
+
</table>
|
| 69 |
+
</td>
|
| 70 |
+
</tr>
|
| 71 |
+
</table>
|
| 72 |
+
</div>
|
| 73 |
+
</body>
|
app/locale/tr_TR/Fooman_EmailAttachments.csv
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"Attach Invoice as PDF","Faturayı PDF Olarak Ekle"
|
| 2 |
+
"Attach Terms and Conditions","Sözleşmeleri Ekle"
|
| 3 |
+
"Attach Packing Slip as PDF","Toplama Listelerini PDF Olarak Ekle"
|
| 4 |
+
"Attach Credit Memo as PDF","Alacakları PDF Olarak Ekle"
|
| 5 |
+
"Attach Order as PDF","Siparişleri PDF Olarak Ekle"
|
| 6 |
+
"Print Orders","Siparişleri Yazdır"
|
| 7 |
+
"Attach Product Attachments","Ürün Eklerini Ekle"
|
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>2015-
|
| 21 |
-
<time>01:
|
| 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.11.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-10-21</date>
|
| 21 |
+
<time>02:01:13</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="43519496cddffb66ea32b6501795aea0"/></dir><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="d26d3fb49941a0f7deab852d2dace37b"/><file name="Fooman.php" hash="7cb13fc6a8f3ab2cc4522c767827463b"/></dir><dir name="Template"><file name="Mailer.php" hash="caf26b4981bb2588ea9c80f789ea327c"/></dir><file name="Queue.php" hash="df640a479bf40bc71cdcc7b824631138"/></dir></dir><dir name="Order"><dir name="Pdf"><file name="BundleItems.php" hash="29222809b95b58e7a22ee374780e9486"/><file name="Order.php" hash="06ad3e52e2c1ed2f7c194555f687d05c"/></dir></dir><dir name="System"><file name="File.php" hash="70b05b8e860088b0d2769d7a79c38e0c"/></dir><file name="Observer.php" hash="9e621688731a5bd3a4f194f5a91a88f3"/><file name="Selftester.php" hash="5a5e0edef4249d49a11a3d7df62af894"/></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="5d67c71e45b2c4a3aa7bfb5b79ab7304"/><file name="system.xml" hash="ce767d4fea83b6d0c4d447e035ec0f5c"/></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"><dir name="template"><dir name="email"><dir name="sales"><file name="order_new_packingslip.html" hash="298c5ed126d7f2e28d731f621b7c82e0"/></dir></dir></dir><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><dir name="tr_TR"><file name="Fooman_EmailAttachments.csv" hash="5558cec8fd8faf7bb4333bfc75a5bc6c"/></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>
|
