Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

can attach invoice to shipping email #42

Open
ozee31 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

can attach invoice to shipping email #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/code/community/Fooman/EmailAttachments/Model/Observer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ public function beforeSendShipment($observer)
Mage::helper('emailattachments')->addAttachment(
$pdf, $mailTemplate, $this->getShipmentAttachmentName($shipment)
);
/*
}

if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachinvoicepdf', $storeId)) {
$pdf = Mage::getModel('sales/order_pdf_invoice')->getPdf(
$shipment->getOrder()->getInvoiceCollection()
);
Expand All @@ -209,7 +211,6 @@ public function beforeSendShipment($observer)
$mailTemplate,
Mage::helper('sales')->__('Invoices for Order') . "_" . $shipment->getOrder()->getIncrementId()
);
*/
}

if (Mage::getStoreConfig('sales_email/' . $configPath . '/attachagreement', $storeId)) {
Expand Down
13 changes: 12 additions & 1 deletion app/code/community/Fooman/EmailAttachments/etc/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
<label>Attach Terms and Conditions</label>
<tooltip><![CDATA[When set to Yes, your Terms and Conditions pdf document
(from <b>Sales &gt; Terms and Conditions</b>) will be automatically attached to the email. Terms
and conditions as html and text files are not supported.]]></tooltip>
and conditions as html and text files are not supported.]]></tooltip>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>70</sort_order>
Expand Down Expand Up @@ -411,6 +411,17 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</attachpdf>
<attachinvoicepdf translate="label">
<label>Attach Invoice as PDF</label>
<tooltip>When set to Yes, your invoice pdf document will be
automatically attached to the invoice email.</tooltip>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>60</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</attachinvoicepdf>
<attachagreement translate="label">
<label>Attach Terms and Conditions</label>
<tooltip><![CDATA[When set to Yes, your Terms and Conditions pdf document
Expand Down