Merge branch 'ticket-13814-mailAlertUpdate' into develop
This commit is contained in:
commit
45a83412e6
@ -153,8 +153,8 @@ class AdminAntAlert extends AdminTab {
|
||||
<tr>
|
||||
<th class="text-left">'.$this->l('ID').'</th>
|
||||
<th class="text-left">'.$this->l('Contact').'</th>
|
||||
<th class="text-left">'.$this->l('Mess per hours').'</th>
|
||||
<th class="text-left">'.$this->l('Last sent').'</th>
|
||||
<th class="text-left">'.$this->l('Limite par heures').'</th>
|
||||
<th class="text-left">'.$this->l('Dernier envoi').'</th>
|
||||
<th class="text-center">'.$this->l('Active').'</th>
|
||||
<th class="text-center">'.$this->l('Action').'</th>
|
||||
</tr>
|
||||
@ -209,7 +209,7 @@ class AdminAntAlert extends AdminTab {
|
||||
$this->helperForm->_forms = array(
|
||||
array(
|
||||
'action' => $currentIndex . '&token=' . Tools::getAdminTokenLite('AdminAntAlert'),
|
||||
'title' => '<span class="text-rose glyphicon glyphicon-tags"></span> '.$this->l('Alert'),
|
||||
'title' => '<span class="text-rose glyphicon glyphicon-tags"></span> '.$this->l('Alerte'),
|
||||
'class' => 'form-horizontal',
|
||||
'class_div' => 'col-md-12',
|
||||
'sections' => array(
|
||||
@ -264,9 +264,9 @@ class AdminAntAlert extends AdminTab {
|
||||
<br>
|
||||
Par exemple :</p>
|
||||
<ul>
|
||||
<li style="font-size:13px;">Limit <b>50</b> en <b>1</b> heure pour le contact "Retour/Echange" </li>
|
||||
<li style="font-size:13px;">Limite <b>50</b> en <b>1</b> heure pour le contact "Retour/Echange" </li>
|
||||
</ul>
|
||||
<p>Ici un mail d\'alert se déclenche après 1h si 50 messages ou plus, concernant les Retour/Echange, ont été envoyés.</p>
|
||||
<p>Ici un mail d\'alerte se déclenche après 1h si 50 messages ou plus, concernant les Retour/Echange, ont été envoyés.</p>
|
||||
<p>Une seule alerte par type de contact possible !</p>
|
||||
<p></p>'
|
||||
),
|
||||
@ -278,7 +278,7 @@ class AdminAntAlert extends AdminTab {
|
||||
|
||||
|
||||
if (isset($alert)) {
|
||||
$this->helperForm->_forms[0]['sections'][0]['title'] = "Editer une alert";
|
||||
$this->helperForm->_forms[0]['sections'][0]['title'] = "Editer une alerte";
|
||||
$this->helperForm->_forms[0]['sections'][0]['inputs'][] = array(
|
||||
'type' => 'hidden',
|
||||
'name' => 'id_alert',
|
||||
@ -290,23 +290,23 @@ class AdminAntAlert extends AdminTab {
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-default',
|
||||
'name' => 'newAlert',
|
||||
'value' => $this->l('Nouvelle Alert')
|
||||
'value' => $this->l('Nouvelle Alerte')
|
||||
),
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'editAlert',
|
||||
'value' => $this->l('Editer l\'alert')
|
||||
'value' => $this->l('Editer l\'alerte')
|
||||
),
|
||||
);
|
||||
} else {
|
||||
$this->helperForm->_forms[0]['sections'][0]['title'] = "Ajouter une alert";
|
||||
$this->helperForm->_forms[0]['sections'][0]['title'] = "Ajouter une alerte";
|
||||
$this->helperForm->_forms[0]['sections'][0]['actions'] = array(
|
||||
array(
|
||||
'type' => 'submit',
|
||||
'class' => 'btn-primary',
|
||||
'name' => 'addAlert',
|
||||
'value' => $this->l('Ajouter l\'alert')
|
||||
'value' => $this->l('Ajouter l\'alerte')
|
||||
),
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user