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
controllers/admin/AdminDeliverySlipController.php
+2 -3
View File
@@ -108,9 +108,8 @@ class AdminDeliverySlipControllerCore extends AdminController
$this->_errors[] = Tools::displayError('Invalid end date');
if (!count($this->_errors))
{
$orders = Order::getOrdersIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'), null, 'delivery');
if (count($orders))
Tools::redirectAdmin('pdf.php?deliveryslips='.urlencode(serialize($orders)).'&token='.$this->token);
if (count(OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))
Tools::redirectAdmin('pdf.php?deliveryslips&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')).'&token='.$this->token);
else
$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))
{
$order_invoice_list = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
if (count($order_invoice_list))
if (count(OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))
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');
@@ -232,7 +230,7 @@ class AdminInvoicesControllerCore extends AdminController
else
{
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);
$this->_errors[] = $this->l('No invoice found for this status');