[-] BO : fixed bug on Invoice generation in AdminInvoices

admin-dev/pdf.php

@@ -146,34 +146,25 @@ function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
 
 function generateInvoicesPDF()
 {
-	$id_orders_list = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to'], NULL, 'invoice');
+	$order_invoice_collection = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to'], NULL, 'invoice');
 
-	if (!is_array($id_orders_list))
+	if (!sizeof($order_invoice_collection))
-		die (Tools::displayError('No invoices found'));
+		die(Tools::displayError('No invoices found'));
 
- 	 generateOrderInvoicesPDF($id_orders_list);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateInvoicesPDF2()
 {
-	$id_orders_list = array();
+	$order_invoice_collection = array();
 	foreach (explode('-', Tools::getValue('id_order_state')) as $id_order_state)
-		if (is_array($id_orders = Order::getOrderIdsByStatus((int)$id_order_state)))
+		if (is_array($order_invoices = OrderInvoice::getByStatus($id_order_state)))
-			$id_orders_list = array_merge($id_orders_list, $id_orders);
+			$order_invoice_collection = array_merge($order_invoices, $order_invoice_collection);
 
- 	 generateOrderInvoicesPDF($id_orders_list);
+	if (!sizeof($order_invoice_collection))
-}
+		die(Tools::displayError('No invoices found'));
 
-function generateOrderInvoicesPDF($id_orders_list)
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
-{
-    $orders_invoices = array();
-    foreach ($id_orders_list as $id_order)
-    {
-			$order = new Order((int)$id_order);
-			$orders_invoices = array_merge($orders_invoices, $order->getInvoicesCollection());
-	 }
-
-    generatePDF($orders_invoices, PDF::TEMPLATE_INVOICE);
 }
 
 function generateOrderSlipsPDF()
@@ -196,7 +187,6 @@ function generateDeliverySlipsPDF()
 		generatePDF($slips, PDF::TEMPLATE_DELIVERY_SLIP);
 }
 
-
 function generatePDF($object, $template)
 {
 	global $smarty;

admin-dev/themes/default/template/invoices/form.tpl

@@ -65,7 +65,7 @@
 	<div class="margin-form">
 		{if $input.type == 'checkboxStatuses'}
 			{foreach $input.values.query as $value}
-				{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]|intval}
+				{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
 				<input type="checkbox"
 					name="{$input.name}[]"
 					id="{$id_checkbox}"

classes/order/Order.php

@@ -880,8 +880,16 @@ class OrderCore extends ObjectModel
 		return $orders;
 	}
 
+	/**
+	 * @deprecated 1.5.0.3
+	 *
+	 * @static
+	 * @param $id_order_state
+	 * @return array
+	 */
 	public static function getOrderIdsByStatus($id_order_state)
 	{
+		Tools::displayAsDeprecated();
 		$sql = 'SELECT id_order
 				FROM '._DB_PREFIX_.'orders o
 				WHERE '.(int)$id_order_state.' = (

classes/order/OrderInvoice.php

@@ -429,6 +429,32 @@ class OrderInvoiceCore extends ObjectModel
 		return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list);
 	}
 
+	/**
+	 * @since 1.5.0.3
+	 * @static
+	 * @param $id_order_state
+	 * @return array collection of OrderInvoice
+	 */
+	public static function getByStatus($id_order_state)
+	{
+		$order_invoice_list = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
+			SELECT oi.*
+			FROM `'._DB_PREFIX_.'order_invoice` oi
+			LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
+			WHERE '.(int)$id_order_state.' = (
+				SELECT id_order_state
+				FROM '._DB_PREFIX_.'order_history oh
+				WHERE oh.id_order = o.id_order
+				ORDER BY date_add DESC, id_order_history DESC
+				LIMIT 1
+			)
+			'.Context::getContext()->shop->addSqlRestriction(false, 'o').'
+			ORDER BY oi.`date_add` ASC
+		');
+
+		return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list);
+	}
+
 	/**
 	 * @since 1.5
 	 * @static

classes/pdf/PDF.php

@@ -48,7 +48,7 @@ class PDFCore
 		$this->smarty = $smarty;
 
 		$this->objects = $objects;
-		if (!($objects instanceof Iterator))
+		if (!($objects instanceof Iterator) && !is_array($objects))
 			$this->objects = array($objects);
 	}
 

controllers/admin/AdminInvoicesController.php

@@ -150,7 +150,7 @@ class AdminInvoicesControllerCore extends AdminController
 		);
 
 		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
-			SELECT COUNT(*) as nbOrders, (
+			SELECT COUNT(o.id_order) as nbOrders, (
 				SELECT oh.id_order_state
 				FROM '._DB_PREFIX_.'order_history oh
 				WHERE oh.id_order = oi.id_order