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

Merge branch 'ticket-12236-UpdateBDCLog' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-17 15:07:29 +01:00
commit 8b2ef07eb8
1 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
modules/privatesales_logistique/exportOrderForm.php
View File

@ -49,6 +49,11 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
'Missing' => 'Missing',
'Colisage' => 'Packing',
'To Sent' => 'To sent',
'To Stock' => 'To stock',
'Shipped Product' => 'Shipped products',
'The number below must be present on each document regarding this order, delivery note, invoice :' => 'The number below must be present on each document regarding this order, delivery note, invoice :',
'PURCHASE ORDER NUMBER' => 'PURCHASE ORDER NUMBER',
'Delivery adress' => 'Delivery address',
@ -75,6 +80,11 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
'Missing' => 'Manquant',
'Colisage' => 'Colisage/Ferme',
'To Sent' => 'À envoyer',
'To Stock' => 'À mettre en stock',
'Shipped Product' => 'Produits livrés',
'PURCHASE ORDER NUMBER' => 'NUMERO DE BON DE COMMANDE',
'Delivery adress' => 'Adresse de livraison',
'PURCHASE ORDER DATE' => 'DATE DU BON DE COMMANDE',
@ -301,7 +311,7 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
if($have_declinaison === true)
{
if ($type == 4) {
$lastColumn = 'K';
$lastColumn = 'L';
$letter_product_ref_interne = 'B';
$letter_product_name = 'C';
@ -311,11 +321,12 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$letter_product_M1 = 'F';
$letter_product_multi = 'G';
$letter_product_colisage = 'H';
$letter_product_stock3btk = 'I';
$letter_product_missing = 'J';
$letter_product_stock3btk = 'H';
$letter_product_missing = 'I';
$letter_product_to_sent = 'J'; // (M1 + Multi - Missing)
$letter_product_to_stock = 'K';
$letter_product_total_qty= 'K';
$letter_product_shipped = 'L'; // (M1 + Multi - stock3BTK - Missing + to_stock)
} else {
@ -354,21 +365,22 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
else
{
if ($type == 4) {
$lastColumn = 'J';
$lastColumn = 'K';
$letter_product_ref_interne = 'B';
$letter_product_name = 'C';
//$letter_product_attribute_name = 'D';
$letter_product_ht = 'D';
/*$letter_product_M1_M2 = 'E';*/
//$letter_product_M1_M2 = 'F';
$letter_product_M1 = 'E';
$letter_product_multi = 'F';
$letter_product_colisage = 'G';
$letter_product_stock3btk = 'H';
$letter_product_missing = 'I';
$letter_product_stock3btk = 'G';
$letter_product_missing = 'H';
$letter_product_to_sent = 'I'; // (M1 + Multi - Missing)
$letter_product_to_stock = 'I';
$letter_product_total_qty= 'J';
$letter_product_shipped = 'K'; // (M1 + Multi - stock3BTK - Missing + to_stock)
} else {
@ -723,11 +735,6 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_multi.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_multi.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_colisage.$i, $lang['Colisage']);
$activeSheet->getStyle($letter_product_colisage.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_colisage.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_colisage.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_stock3btk.$i, 'Stock 3BTK');
$activeSheet->getStyle($letter_product_stock3btk.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_stock3btk.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
@ -738,10 +745,20 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_missing.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_missing.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_total_qty.$i, 'Total qty');
$activeSheet->getStyle($letter_product_total_qty.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_total_qty.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_total_qty.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_to_sent.$i, $lang['To Sent']);
$activeSheet->getStyle($letter_product_to_sent.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_to_sent.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_to_sent.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_to_stock.$i, $lang['To Stock']);
$activeSheet->getStyle($letter_product_to_stock.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_to_stock.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_to_stock.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_shipped.$i, $lang['Shipped Product']);
$activeSheet->getStyle($letter_product_shipped.$i)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
$activeSheet->getStyle($letter_product_shipped.$i)->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
$activeSheet->getStyle($letter_product_shipped.$i)->applyFromArray($borders_style);
} else {
@ -898,15 +915,17 @@ if(Tools::getValue('action') == 'getOrderForm' && ( ( $id_category = Tools::getV
$activeSheet->getStyle($letter_product_M1.$i)->applyFromArray($borders_style);
// colonnes vide - a remplir par 3BTK
//$activeSheet->setCellValue($letter_product_colisage.$i, 0);
$activeSheet->getStyle($letter_product_colisage.$i)->applyFromArray($borders_style);
//$activeSheet->setCellValue($letter_product_stock3btk.$i, 0);
$activeSheet->getStyle($letter_product_stock3btk.$i)->applyFromArray($borders_style);
//$activeSheet->setCellValue($letter_product_missing.$i, 0);
$activeSheet->getStyle($letter_product_missing.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_total_qty.$i, '='.$letter_product_M1.$i.'+'.$letter_product_multi.$i.'+'.$letter_product_colisage.$i.'-'.$letter_product_stock3btk.$i.'-'.$letter_product_missing.$i);
$activeSheet->getStyle($letter_product_total_qty.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_to_sent.$i, '='.$letter_product_M1.$i.'+'.$letter_product_multi.$i.'-'.$letter_product_missing.$i);
$activeSheet->getStyle($letter_product_to_sent.$i)->applyFromArray($borders_style);
// colonnes vide - a remplir par 3BTK
$activeSheet->getStyle($letter_product_to_stock.$i)->applyFromArray($borders_style);
$activeSheet->setCellValue($letter_product_shipped.$i, '='.$letter_product_M1.$i.'+'.$letter_product_multi.$i.'-'.$letter_product_stock3btk.$i.'-'.$letter_product_missing.$i.'+'.$letter_product_to_stock.$i);
$activeSheet->getStyle($letter_product_shipped.$i)->applyFromArray($borders_style);
$i++;
}