lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code comment

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-29 12:58:33 +01:00
parent 0a11d52d53
commit c67e57836e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/mailing/card.php
View File

@ -156,6 +156,7 @@ if (empty($reshook))
$sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag"; $sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id; $sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
$sql .= " ORDER BY mc.statut DESC"; // first status 0, then status -1
dol_syslog("card.php: select targets", LOG_DEBUG); dol_syslog("card.php: select targets", LOG_DEBUG);
$resql=$db->query($sql); $resql=$db->query($sql);

13
htdocs/comm/mailing/cibles.php
View File

@ -171,6 +171,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
/* /*
* View * View
*/ */
llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing'); llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
$form = new Form($db); $form = new Form($db);
@ -578,7 +579,7 @@ if ($object->fetch($id) >= 0)
} }
print '</td>'; print '</td>';
// Statut pour l'email destinataire (Attentioon != statut du mailing) // Status of recipient sending email (Warning != status of emailing)
if ($obj->statut == 0) if ($obj->statut == 0)
{ {
print '<td align="center">&nbsp;</td>'; print '<td align="center">&nbsp;</td>';
@ -589,18 +590,22 @@ if ($object->fetch($id) >= 0)
{ {
print '<td align="center">'.$obj->date_envoi.'</td>'; print '<td align="center">'.$obj->date_envoi.'</td>';
print '<td align="right" class="nowrap">'; print '<td align="right" class="nowrap">';
print $object::libStatutDest($obj->statut,2,$obj->error_text); print $object::libStatutDest($obj->statut, 2, $obj->error_text);
print '</td>'; print '</td>';
} }
// Search Icon // Search Icon
print '<td align="right">'; print '<td align="right">';
if ($obj->statut == 0) if ($obj->statut == 0) // Not sent yet
{ {
if ($user->rights->mailing->creer && $allowaddtarget) { if ($user->rights->mailing->creer && $allowaddtarget) {
print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")); print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
} }
} }
/*if ($obj->statut == -1) // Sent with error
{
print '<a href="'.$_SERVER['PHP_SELF'].'?action=retry&rowid='.$obj->rowid.$param.'">'.$langs->trans("Retry").'</a>';
}*/
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';