antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-extract' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-15 12:05:53 +02:00
commit c1e1f78057
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -630,6 +630,8 @@ class AdminBulkUpdate extends AdminTab {
'product_name',
'combination',
'ean13',
'NC8',
'Pays de fabrication',
// 'location',
// 'brand',
'quantity_sold',
@ -753,6 +755,12 @@ class AdminBulkUpdate extends AdminTab {
AND h.`id_order_state` = 2
');
$customs = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`
FROM `'._DB_PREFIX_.'product_customs`
WHERE `id_product` = '.(int) $p->id
);
$names = array_unique($v['name']);
sort($names, SORT_STRING);
fputcsv($f, array(
@ -765,6 +773,8 @@ class AdminBulkUpdate extends AdminTab {
$p->name[$id_lang],
implode(' - ', $names),
$v['ean13'],
$customs['nc8'],
$customs['id_country'],
// $v['location'],
// $v['brand'],
$quantity_sold,
@ -798,6 +808,12 @@ class AdminBulkUpdate extends AdminTab {
AND h.`id_order_state` = 2
');
$customs = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`
FROM `'._DB_PREFIX_.'product_customs`
WHERE `id_product` = '.(int) $p->id
);
fputcsv($f, array(
$p->supplier_reference,
$p->id,
@ -808,6 +824,8 @@ class AdminBulkUpdate extends AdminTab {
$p->name[$id_lang],
'',
$p->ean13,
$customs['nc8'],
$customs['id_country'],
// $p->location,
// $p->manufacturer_name,
$quantity_sold,
@ -882,6 +900,8 @@ class AdminBulkUpdate extends AdminTab {
'product_name',
'combination',
'ean13',
'NC8',
'Pays de fabrication',
// 'location',
// 'brand',
'quantity_sold',
@ -1006,6 +1026,12 @@ class AdminBulkUpdate extends AdminTab {
AND h.`id_order_state` = 2
');
$customs = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`
FROM `'._DB_PREFIX_.'product_customs`
WHERE `id_product` = '.(int) $p->id
);
fputcsv($f, array(
$v['supplier_reference'],
$p->id,
@ -1016,6 +1042,8 @@ class AdminBulkUpdate extends AdminTab {
$p->name[$id_lang],
implode(' - ', $names),
$v['ean13'],
$customs['nc8'],
$customs['id_country'],
// $v['location'],
// $v['brand'],
$quantity_sold,
@ -1047,6 +1075,12 @@ class AdminBulkUpdate extends AdminTab {
AND h.`id_order_state` = 2
');
$customs = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`
FROM `'._DB_PREFIX_.'product_customs`
WHERE `id_product` = '.(int) $p->id
);
fputcsv($f, array(
$p->supplier_reference,
$p->id,
@ -1057,6 +1091,8 @@ class AdminBulkUpdate extends AdminTab {
$p->name[$id_lang],
'',
$p->ean13,
$customs['nc8'],
$customs['id_country'],
// $p->location,
// $p->manufacturer_name,
$quantity_sold,