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

[-] BO : fixed bug on Delivery slip generation in AdminDeliverySlip

Browse Source
This commit is contained in:
aFolletete
2012-01-02 18:16:09 +00:00
parent 3056e7c943
commit 4cd3d5699f
5 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/pdf.php
+7 -4
View File
@@ -146,7 +146,7 @@ function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
function generateInvoicesPDF() function generateInvoicesPDF()
{ {
$order_invoice_collection = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to'], NULL, 'invoice'); $order_invoice_collection = OrderInvoice::getByDateInterval($_GET['date_from'], $_GET['date_to']);
if (!sizeof($order_invoice_collection)) if (!sizeof($order_invoice_collection))
die(Tools::displayError('No invoices found')); die(Tools::displayError('No invoices found'));
@@ -182,9 +182,12 @@ function generateOrderSlipsPDF()
function generateDeliverySlipsPDF() function generateDeliverySlipsPDF()
{ {
$slips = unserialize(urldecode($_GET['deliveryslips'])); $order_invoice_collection = OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
if (is_array($slips))
generatePDF($slips, PDF::TEMPLATE_DELIVERY_SLIP); if (!sizeof($order_invoice_collection))
die(Tools::displayError('No invoices found'));
generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
} }
function generatePDF($object, $template) function generatePDF($object, $template)
classes/order/Order.php
+11 -11
View File
@@ -851,17 +851,17 @@ class OrderCore extends ObjectModel
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
} }
/** /**
* @deprecated since 1.5.0.2 * @deprecated since 1.5.0.2
* *
* @static * @static
* @param $date_from * @param $date_from
* @param $date_to * @param $date_to
* @param $id_customer * @param $id_customer
* @param $type * @param $type
* *
* @return array * @return array
*/ */
public static function getOrdersIdInvoiceByDate($date_from, $date_to, $id_customer = NULL, $type = NULL) public static function getOrdersIdInvoiceByDate($date_from, $date_to, $id_customer = NULL, $type = NULL)
{ {
Tools::displayAsDeprecated(); Tools::displayAsDeprecated();
classes/order/OrderInvoice.php
+24 -2
View File
@@ -422,8 +422,8 @@ class OrderInvoiceCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
WHERE DATE_ADD(oi.date_add, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' WHERE DATE_ADD(oi.date_add, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\'
AND oi.date_add >= \''.pSQL($date_from).'\' AND oi.date_add >= \''.pSQL($date_from).'\'
'.Context::getContext()->shop->addSqlRestriction(). '.Context::getContext()->shop->addSqlRestriction().'
' ORDER BY oi.date_add ASC ORDER BY oi.date_add ASC
'); ');
return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list); return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list);
@@ -455,6 +455,28 @@ class OrderInvoiceCore extends ObjectModel
return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list); return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list);
} }
/**
* @since 1.5.0.3
* @static
* @param $date_from
* @param $date_to
* @return array collection of invoice
*/
public static function getByDeliveryDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
WHERE DATE_ADD(oi.delivery_date, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\'
AND oi.date_add >= \''.pSQL($date_from).'\'
'.Context::getContext()->shop->addSqlRestriction().'
ORDER BY oi.delivery_date ASC
');
return ObjectModel::hydrateCollection('OrderInvoice', $order_invoice_list);
}
/** /**
* @since 1.5 * @since 1.5
* @static * @static
controllers/admin/AdminDeliverySlipController.php
+2 -3
View File
@@ -108,9 +108,8 @@ class AdminDeliverySlipControllerCore extends AdminController
$this->_errors[] = Tools::displayError('Invalid end date'); $this->_errors[] = Tools::displayError('Invalid end date');
if (!count($this->_errors)) if (!count($this->_errors))
{ {
$orders = Order::getOrdersIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'), null, 'delivery'); if (count(OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))
if (count($orders)) Tools::redirectAdmin('pdf.php?deliveryslips&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')).'&token='.$this->token);
Tools::redirectAdmin('pdf.php?deliveryslips='.urlencode(serialize($orders)).'&token='.$this->token);
else else
$this->_errors[] = Tools::displayError('No delivery slip found for this period'); $this->_errors[] = Tools::displayError('No delivery slip found for this period');
} }
controllers/admin/AdminInvoicesController.php
+2 -4
View File
@@ -217,9 +217,7 @@ class AdminInvoicesControllerCore extends AdminController
if (!count($this->_errors)) if (!count($this->_errors))
{ {
$order_invoice_list = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to')); if (count(OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))
if (count($order_invoice_list))
Tools::redirectAdmin('pdf.php?invoices&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')).'&token='.$this->token); Tools::redirectAdmin('pdf.php?invoices&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')).'&token='.$this->token);
$this->_errors[] = $this->l('No invoice found for this period'); $this->_errors[] = $this->l('No invoice found for this period');
@@ -232,7 +230,7 @@ class AdminInvoicesControllerCore extends AdminController
else else
{ {
foreach ($status_array as $id_order_state) foreach ($status_array as $id_order_state)
if (count($orders = Order::getOrderIdsByStatus((int)$id_order_state))) if (count(OrderInvoice::getByStatus((int)$id_order_state)))
Tools::redirectAdmin('pdf.php?invoices2&id_order_state='.implode('-', $status_array).'&token='.$this->token); Tools::redirectAdmin('pdf.php?invoices2&id_order_state='.implode('-', $status_array).'&token='.$this->token);
$this->_errors[] = $this->l('No invoice found for this status'); $this->_errors[] = $this->l('No invoice found for this status');