Merge branch 'ticket/r13883-exportnewsletterpro' into dev

This commit is contained in:
Michael RICOIS 2017-09-04 16:44:57 +02:00
commit aeaf1786fc

View File

@ -79,12 +79,12 @@
$this->subVersion = true;
}
if (Tools::isSubmit('submitNewsletterExportPartV5')) {
$this->version = 5;
$this->version = 2;
$this->subVersion = true;
}
// Export Pro avec template v5
if (Tools::isSubmit('submitNewsletterExportPartV6')) {
$this->version = 5;
$this->version = 1;
$_GET['id_group'] = 4;
$this->subVersion = true;
$this->trackingSuffix = 'PRO';
@ -417,10 +417,10 @@
$this->fields_form = array(
$formSettings,
$formExportPart,
$formExportPartV2,
//$formExportPart,
//$formExportPartV2,
$formExportPartV3,
$formExportPartV4,
//$formExportPartV4,
$formExportPartV5,
$formExportPartV6,
$formExportPro