dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] PDF : New hook actionPDFInvoiceRender

Browse Source 
[-] PDF : Can't display invoice due to Collection
This commit is contained in:
fBrignoli
2011-12-12 15:23:39 +00:00
parent bfb331c495
commit d8abab3eef
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/pdf.php
+4 -1
View File
@@ -81,7 +81,9 @@ function generateInvoicePDFByIdOrder($id_order)
if (!Validate::isLoadedObject($order)) if (!Validate::isLoadedObject($order))
die(Tools::displayError('Cannot find order in database')); die(Tools::displayError('Cannot find order in database'));
generatePDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE); $order_invoice_list = $order->getInvoicesCollection();
Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
generatePDF($order_invoice_list, PDF::TEMPLATE_INVOICE);
} }
function generateInvoicePDFByIdOrderInvoice($id_order_invoice) function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
@@ -90,6 +92,7 @@ function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
if (!Validate::isLoadedObject($order_invoice)) if (!Validate::isLoadedObject($order_invoice))
die(Tools::displayError('Cannot find order invoice in database')); die(Tools::displayError('Cannot find order invoice in database'));
Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => array($order_invoice)));
generatePDF($order_invoice, PDF::TEMPLATE_INVOICE); generatePDF($order_invoice, PDF::TEMPLATE_INVOICE);
} }
classes/pdf/PDF.php
+1 -1
View File
@@ -48,7 +48,7 @@ class PDFCore
$this->smarty = $smarty; $this->smarty = $smarty;
$this->objects = $objects; $this->objects = $objects;
if (!is_array($objects)) if (!($objects instanceof Iterator))
$this->objects = array($objects); $this->objects = array($objects);
} }
controllers/front/PdfInvoiceController.php
+5 -2
View File
@@ -66,8 +66,11 @@ class PdfInvoiceControllerCore extends FrontController
} }
public function display() public function display()
{ {
$pdf = new PDF($this->order, PDF::TEMPLATE_INVOICE, $this->context->smarty, $this->context->language->id); $order_invoice_list = $this->order->getInvoicesCollection();
Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
$pdf = new PDF($order_invoice_list, PDF::TEMPLATE_INVOICE, $this->context->smarty, $this->context->language->id);
$pdf->render(); $pdf->render();
} }