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

// Fixed CSV export without pagination. Fixed StockManager, with new Collection object. Fixed StockMvt : id_supply_order was missing.

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10967 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-12-06 09:37:23 +00:00
parent f784411c4b
commit 623303f7ee
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockMvtController.php
+13 -6
View File
@@ -203,6 +203,9 @@ class AdminStockMvtControllerCore extends AdminController
*/
public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false)
{
if (Tools::isSubmit('csv'))
$limit = false;
parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
//If there is a field product_name in the list, check if this field is null and display standard message
@@ -253,18 +256,22 @@ class AdminStockMvtControllerCore extends AdminController
header('Content-disposition: attachment; filename="'.$filename);
// puts keys
$keys = array('id_order', 'id_supply_order', 'firstname', 'lastname', 'quantity',
'date', 'sign', 'price_te', 'product_name', 'label', 'reference', 'ean13', 'upc');
$keys = array('id_order', 'id_supply_order', 'emloyee_firstname', 'employee_lastname', 'physical_quantity',
'date_add', 'sign', 'price_te', 'product_name', 'label', 'product_reference', 'product_ean13', 'product_upc');
echo sprintf("%s\n", implode(';', $keys));
// puts rows
foreach ($this->_list as $row)
{
// unsets not needed keys
unset($row['id_stock_mvt'], $row['id_stock'], $row['id_stock_mvt_reason'],
$row['id_employee'], $row['last_wa'], $row['current_wa'], $row['referer'], $row['id_currency'], $row['employee']);
$row_csv = array($row['id_order'], $row['id_supply_order'], $row['employee_firstname'],
$row['employee_lastname'], $row['physical_quantity'], $row['date_add'],
$row['sign'], $row['price_te'], $row['product_name'],
$row['reason'], $row['product_reference'], $row['product_ean13'], $row['product_upc']
);
// puts one row
echo sprintf("%s\n", implode(';', array_map(array('CSVCore', 'wrap'), $row)));
echo sprintf("%s\n", implode(';', array_map(array('CSVCore', 'wrap'), $row_csv)));
}
}