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

Merge branch 'ticket-newExtracts' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-20 11:59:27 +02:00
commit 789b011f7f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -653,7 +653,7 @@ class AdminBulkUpdate extends AdminTab {
foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
unlink($filename);
}
$fname = date( "Ymd", strtotime($date_start)).'-'.date( "Ymd", strtotime($date_end)).'.csv';
$fname = 'DEB-int-'.date( "Ymd", strtotime($date_start)).'-'.date( "Ymd", strtotime($date_end)).'.csv';
$f = fopen(dirname(__FILE__).'/'.$fname, 'w');
// uft8 sans bom pour accent
@ -745,7 +745,7 @@ class AdminBulkUpdate extends AdminTab {
FROM `'._DB_PREFIX_.'order_history`
WHERE `id_order`=d.`id_order`
ORDER BY `date_add` DESC LIMIT 1
) NOT IN (1,6,8,9,10,11,14,15,18)
) NOT IN (1,6,8,9,10,11,14,15,18)
');
if ($quantity_sold == 0) {
@ -781,7 +781,6 @@ class AdminBulkUpdate extends AdminTab {
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = d.`id_order`
WHERE d.`product_id` = '.(int) $p->id.'
AND d.`product_attribute_id` = 0
AND (
SELECT `id_order_state`
FROM `'._DB_PREFIX_.'order_history`
@ -869,7 +868,7 @@ class AdminBulkUpdate extends AdminTab {
);
}
}
//echo "<pre>";var_dump($orders_detail);echo "</pre>";die();
$products = array_unique($products);
if(count($products) > 20000){
$output .= '<p class="conf">Choisir une plage moins grande. <br /> Export > 20000 produits</p>';
@ -879,7 +878,7 @@ class AdminBulkUpdate extends AdminTab {
foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
unlink($filename);
}
$fname = date( "Ymd", strtotime($date_start)).'-'.date( "Ymd", strtotime($date_end)).'.csv';
$fname = 'DEB-exp-'.date( "Ymd", strtotime($date_start)).'-'.date( "Ymd", strtotime($date_end)).'.csv';
$f = fopen(dirname(__FILE__).'/'.$fname, 'w');
// uft8 sans bom pour accent