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

Merge remote-tracking branch 'origin/ticket/r13883-exportnewsletterpro' into dev

Browse Source
This commit is contained in:
Michael RICOIS 2017-09-13 10:09:40 +02:00
commit 5ae19736bc
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/ant_export_privatesales_newsletter/controllers/admin/AdminExportPrivatesalesNewsletterController.php
View File

@ -67,31 +67,37 @@
$this->trackingSuffix = 'PART';
break;
}
// Disable
if (Tools::isSubmit('submitNewsletterExportPartV2')) {
$this->version = 2;
}
// Enable : Export Part - 1 vente en cours /ligne
if (Tools::isSubmit('submitNewsletterExportPartV3')) {
$this->version = 3;
$this->enableV4header = true;
}
// Disable
if (Tools::isSubmit('submitNewsletterExportPartV4')) {
$this->version = 3;
$this->subVersion = true;
}
// Enable : Export Part - 2 ventes en cours /ligne
if (Tools::isSubmit('submitNewsletterExportPartV5')) {
$this->version = 2;
$this->subVersion = true;
}
// Export Pro avec template v5
// Enable : Export Pro - 2 ventes en cours /ligne
if (Tools::isSubmit('submitNewsletterExportPartV6')) {
$this->version = 1;
$this->version = 2;
$_GET['id_group'] = 4;
$this->subVersion = true;
$this->trackingSuffix = 'PRO';
}
$this->exportNewsletter();
}
elseif (Tools::isSubmit('submitNewsletterExportPro')){
// Enable : Export Pro - 1 vente en cours /ligne
elseif (Tools::isSubmit('submitNewsletterExportPro')) {
$this->version = 3;
$_GET['id_group'] = 4;
// reactiver la generation du tracking dans le cron si on veut utiliser le tracking PRO
$this->trackingSuffix = 'PRO';
@ -373,6 +379,20 @@
),
);*/
$formExportPro = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PRO - 1 vente en cours /ligne'),
),
'input' => array(
),
'submit' => array(
'name' => 'submitNewsletterExportPartV4',
'title' => $this->l('Export'),
),
)
);
$formExportPartV5 = array(
'form' => array(
'legend' => array(
@ -401,20 +421,6 @@
),
);
$formExportPro = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PRO avec tracking'),
),
'input' => array(
),
'submit' => array(
'name' => 'submitNewsletterExportPartV4',
'title' => $this->l('Export'),
),
)
);
$this->fields_form = array(
$formSettings,
//$formExportPart,
@ -422,8 +428,8 @@
$formExportPartV3,
//$formExportPartV4,
$formExportPartV5,
$formExportPro,
$formExportPartV6,
$formExportPro
);
$this->display = 'add';