Merge branch 'fix-exportSale'

This commit is contained in:
Marion Muszynski 2017-03-03 11:52:40 +01:00
commit 3e3ba61d50
2 changed files with 2 additions and 2 deletions

View File

@ -1248,7 +1248,7 @@ class AdminBulkUpdate extends AdminTab {
$products = array_unique($products);
$privatesale = Sale::getSaleFromCategory((int) $id_category);
$fname = date( "Ymd", strtotime($privatesale->date_start)).'-'.$privatesale->title[(int)$id_lang].'.csv';
$fname = $id_category.'-'.date( "Ymd", strtotime($privatesale->date_start)).'-'.$privatesale->title[(int)$id_lang].'.csv';
foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
if ($fname == $filename) {
unlink($filename);

View File

@ -970,7 +970,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
}
$products = array_unique($products);
$fname = date( "Ymd", strtotime($sale->date_start)).'-'.$sale->title[(int)$id_lang].'.csv';
$fname = $id_category.'-'.date( "Ymd", strtotime($sale->date_start)).'-'.$sale->title[(int)$id_lang].'.csv';
foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
if ($fname == $filename) {
unlink($filename);