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

This commit is contained in:
Michael RICOIS 2017-08-30 10:14:59 +02:00
commit d69f753f9c

View File

@ -87,6 +87,7 @@
$this->version = 5;
$_GET['id_group'] = 4;
$this->subVersion = true;
$this->trackingSuffix = 'PRO';
}
$this->exportNewsletter();
}
@ -316,7 +317,7 @@
)
);
$formExportPart = array(
/*$formExportPart = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PART - 2 ventes par ligne'),
@ -328,9 +329,9 @@
'title' => $this->l('Export PART'),
),
)
);
);*/
$formExportPartV2 = array(
/*$formExportPartV2 = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PART Version 2 - une vente/ligne'),
@ -342,23 +343,23 @@
'title' => $this->l('Export PART V2'),
),
)
);
);*/
$formExportPartV3 = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PART Version 3 - une vente/ligne - Newsletter light'),
'title' => $this->l('Export PART - 1 vente en cours /ligne'),
),
'input' => array(
),
'submit' => array(
'name' => 'submitNewsletterExportPartV3',
'title' => $this->l('Export PART LIGHT'),
'title' => $this->l('Export'),
),
)
);
$formExportPartV4 = array(
/*$formExportPartV4 = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PART VERSION 4 - 2 VENTES/LIGNE - Newsletter LIGHT')
@ -366,21 +367,21 @@
'input' => array(
),
'submit' => array(
'title' => $this->l('Export PART V4'),
'title' => $this->l('Export'),
'name' => 'submitNewsletterExportPartV4'
),
),
);
);*/
$formExportPartV5 = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PART VERSION 5 - VENTES/LIGNE - Newsletter LIGHT')
'title' => $this->l('Export PART - 2 ventes en cours /ligne')
),
'input' => array(
),
'submit' => array(
'title' => $this->l('Export PART V5'),
'title' => $this->l('Export'),
'name' => 'submitNewsletterExportPartV5'
),
),
@ -389,12 +390,12 @@
$formExportPartV6 = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PART PRO VERSION 5 - Newsletter LIGHT')
'title' => $this->l('Export PRO - 2 ventes en cours /ligne')
),
'input' => array(
),
'submit' => array(
'title' => $this->l('Export PART PRO V5'),
'title' => $this->l('Export'),
'name' => 'submitNewsletterExportPartV6'
),
),
@ -403,13 +404,13 @@
$formExportPro = array(
'form' => array(
'legend' => array(
'title' => $this->l('Export PRO'),
'title' => $this->l('Export PRO avec tracking'),
),
'input' => array(
),
'submit' => array(
'name' => 'submitNewsletterExportPartV4',
'title' => $this->l('Export PRO'),
'title' => $this->l('Export'),
),
)
);