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

Merge remote-tracking branch 'origin/ticket/10655' into devel

Browse Source
This commit is contained in:
PLESK5 2016-09-07 12:05:29 +02:00
commit 4b3f120204
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/privatesales_tools/classes/MakeFile.php
View File

@ -45,7 +45,7 @@ class MakeFile {
case self::TYPE_BDC :
$show_product_ids = LOGISTIQUE_SHOW_DECIMAL_ID_PRODUCT;
// $title = 'Bon de commande ' . $private_sale->name . ' du '.$date_from->getDate('STR').' au '.$date_to->getDate('STR');
$title = 'BDC '.$private_sale->title.' - '.$private_sale->id_privatesales;
$title = 'BDC '.$private_sale->title.' - n°'. Db::getInstance()->getValue('SELECT MAX(`id_privatesales_export`) FROM `'._DB_PREFIX_.'privatesales_logistique_export`');
$letter_bdc_logo = 'B';
$letter_bdc_logo_end = 'C';
@ -147,6 +147,7 @@ class MakeFile {
$activeSheet->SetCellValue($letter_date.$i, 'Date : '.date('d/m/Y') );
$activeSheet->getStyle($letter_date.$i)->getFont()->setBold(true);
$activeSheet->getStyle($letter_date.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
$activeSheet->mergeCells($letter_date.$i.':'.$letter_date_end.$i);
$i ++;
@ -419,6 +420,8 @@ class MakeFile {
// }
$value = Configuration::get('BDC_SHOP_BOTTOM_CONTENT', null, null, Context::getContext()->shop->id);
if($value != '')
{
$i++;
@ -429,7 +432,7 @@ class MakeFile {
$activeSheet->getStyle('B'.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP);
$activeSheet->getStyle('B'.$i)->getAlignment()->setWrapText(true);
}
header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
header('Content-Disposition: attachment;filename="'.$title.'.xlsx"');