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

Merge branch 'ticket-12379-addEanLogBDC' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-02-08 13:12:10 +01:00
commit c0016367e6
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/privatesales_logistique/exportOrderForm.php
View File

@ -312,22 +312,23 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
if($have_declinaison === true)
{
if ($type == 4) {
$lastColumn = 'L';
$lastColumn = 'M';
$letter_product_ref_interne = 'B';
$letter_product_name = 'C';
$letter_product_attribute_name = 'D';
$letter_product_ht = 'E';
$letter_product_ean = 'C';
$letter_product_name = 'D';
$letter_product_attribute_name = 'E';
$letter_product_ht = 'F';
//$letter_product_M1_M2 = 'F';
$letter_product_M1 = 'F';
$letter_product_multi = 'G';
$letter_product_M1 = 'G';
$letter_product_multi = 'H';
$letter_product_stock3btk = 'H';
$letter_product_missing = 'I';
$letter_product_to_sent = 'J'; // (M1 + Multi - Missing)
$letter_product_to_stock = 'K';
$letter_product_stock3btk = 'I';
$letter_product_missing = 'J';
$letter_product_to_sent = 'K'; // (M1 + Multi - Missing)
$letter_product_to_stock = 'L';
$letter_product_shipped = 'L'; // (M1 + Multi - stock3BTK - Missing + to_stock)
$letter_product_shipped = 'M'; // (M1 + Multi - stock3BTK - Missing + to_stock)
} else {
@ -366,22 +367,23 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
else
{
if ($type == 4) {
$lastColumn = 'K';
$lastColumn = 'L';
$letter_product_ref_interne = 'B';
$letter_product_name = 'C';
//$letter_product_attribute_name = 'D';
$letter_product_ht = 'D';
$letter_product_ean = 'C';
$letter_product_name = 'D';
//$letter_product_attribute_name = 'E';
$letter_product_ht = 'E';
//$letter_product_M1_M2 = 'F';
$letter_product_M1 = 'E';
$letter_product_multi = 'F';
$letter_product_M1 = 'F';
$letter_product_multi = 'G';
$letter_product_stock3btk = 'G';
$letter_product_missing = 'H';
$letter_product_to_sent = 'I'; // (M1 + Multi - Missing)
$letter_product_to_stock = 'J';
$letter_product_stock3btk = 'H';
$letter_product_missing = 'I';
$letter_product_to_sent = 'J'; // (M1 + Multi - Missing)
$letter_product_to_stock = 'K';
$letter_product_shipped = 'K'; // (M1 + Multi - stock3BTK - Missing + to_stock)
$letter_product_shipped = 'L'; // (M1 + Multi - stock3BTK - Missing + to_stock)
} else {
@ -712,6 +714,10 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_ref_interne.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_ref_interne.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_ean.$i, $lang['EAN']);
$activeSheet->getStyle($letter_product_ean.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_ean.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_name.$i, $lang['Product Name']);
$activeSheet->getStyle($letter_product_name.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_name.$i)->applyFromArray($borders_style);
@ -899,6 +905,9 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->SetCellValue($letter_product_ref_interne.$i, $values['line']['product_reference']);
$activeSheet->getStyle($letter_product_ref_interne.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_ean.$i, $values['line']['product_ean13']);
$activeSheet->getStyle($letter_product_ean.$i)->applyFromArray($borders_style);
$activeSheet->SetCellValue($letter_product_name.$i, $values['line']['product_name_base']);
$activeSheet->getStyle($letter_product_name.$i)->applyFromArray($borders_style);
if($have_declinaison === true) {