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

// Bugs fix on CSV export on supply order interface

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11030 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-12-07 18:07:38 +00:00
parent 7873905bb5
commit c23c2d983b
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminSupplyOrdersController.php
+22 -13
View File
@@ -343,19 +343,6 @@ class AdminSupplyOrdersControllerCore extends AdminController
$this->tpl_list_vars['current_warehouse'] = $this->getCurrentWarehouse();
$this->tpl_list_vars['filter_status'] = $this->getFilterStatus();
// adds export csv buttons
$this->toolbar_btn['export-csv-orders'] = array(
'short' => 'Export Orders',
'href' => $this->context->link->getAdminLink('AdminSupplyOrders').'&csv_orders',
'desc' => $this->l('Export Orders (CSV)'),
);
$this->toolbar_btn['export-csv-details'] = array(
'short' => 'Export Orders Details',
'href' => $this->context->link->getAdminLink('AdminSupplyOrders').'&csv_orders_details',
'desc' => $this->l('Export Orders Details (CSV)'),
);
// access
unset($this->toolbar_btn['new']);
if ($this->tabAccess['add'] === '1')
@@ -396,6 +383,22 @@ class AdminSupplyOrdersControllerCore extends AdminController
$this->_where .= ' AND st.enclosed != 1';
$first_list = parent::renderList();
if (count($this->_list) > 0)
{
// adds export csv buttons
$this->toolbar_btn['export-csv-orders'] = array(
'short' => 'Export Orders',
'href' => $this->context->link->getAdminLink('AdminSupplyOrders').'&csv_orders',
'desc' => $this->l('Export Orders (CSV)'),
);
$this->toolbar_btn['export-csv-details'] = array(
'short' => 'Export Orders Details',
'href' => $this->context->link->getAdminLink('AdminSupplyOrders').'&csv_orders_details',
'desc' => $this->l('Export Orders Details (CSV)'),
);
}
if (Tools::isSubmit('csv_orders') || Tools::isSubmit('csv_orders_details') || Tools::isSubmit('csv_order_details'))
{
$this->renderCSV();
@@ -1068,6 +1071,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
foreach ($this->_list as $entry)
$ids[] = $entry['id_supply_order'];
if (count($ids) <= 0)
return;
$orders = new Collection('SupplyOrder', $id_lang = (int)Context::getContext()->language->id);
$orders->where('is_template = 0');
$orders->where('id_supply_order IN('.implode(', ', $ids).')');
@@ -1088,6 +1094,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
foreach ($this->_list as $entry)
$ids[] = $entry['id_supply_order'];
if (count($ids) <= 0)
return;
// for each supply order
$keys = array('id_supply_order', 'id_product', 'id_product_attribute', 'reference', 'supplier_reference', 'ean13', 'upc', 'name',
'unit_price_te', 'quantity_expected', 'quantity_received', 'price_te', 'discount_rate', 'discount_value_te',