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

Gestion des erreurs par destinataire sur envoi des mailings

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-11 18:54:01 +00:00
parent 5c72b39ecf
commit 9be2f3aed6
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,19 +265,20 @@ if ($mil->fetch($_GET["id"]) == 0)
$addu = "&id=".$mil->id."&page=$page";; $addu = "&id=".$mil->id."&page=$page";;
print_barre_liste($langs->trans("MailSelectedRecipients"), $page, "cibles.php","&id=".$mil->id,$sortfield,$sortorder,"",$num); print_barre_liste($langs->trans("MailSelectedRecipients"), $page, "cibles.php","&id=".$mil->id,$sortfield,$sortorder,"",$num);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Lastname"),"cibles.php","mc.nom",$addu,"","",$sortfield); print_liste_field_titre($langs->trans("Lastname"),"cibles.php","mc.nom",$addu,"","",$sortfield);
print_liste_field_titre($langs->trans("Firstname"),"cibles.php","mc.prenom",$addu,"","",$sortfield); print_liste_field_titre($langs->trans("Firstname"),"cibles.php","mc.prenom",$addu,"","",$sortfield);
print_liste_field_titre($langs->trans("EMail"),"cibles.php","mc.email",$addu,"","",$sortfield); print_liste_field_titre($langs->trans("EMail"),"cibles.php","mc.email",$addu,"","",$sortfield);
print '<td>'.$langs->trans("Status").'</td>'; print '<td align="center">'.$langs->trans("Status").'</td>';
if ($mil->statut == 0) if ($mil->statut == 0)
{ {
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }
if ($mil->statut != 0) if ($mil->statut != 0)
{ {
print '<td>'.$langs->trans("Date").'</td>'; print '<td align="center">'.$langs->trans("Date").'</td>';
} }
print '</tr>'; print '</tr>';
$var = true; $var = true;
@ -294,16 +295,16 @@ if ($mil->fetch($_GET["id"]) == 0)
print '<td>'.$obj->email.'</td>'; print '<td>'.$obj->email.'</td>';
if ($mil->statut == 0) if ($mil->statut == 0)
{ {
print '<td>'.$langs->trans("MailingStatusNotSent").'</td>'; print '<td align="center">'.$langs->trans("MailingStatusNotSent").'</td>';
print '<td><a href="cibles.php?action=delete&id='.$mil->id.'&rowid='.$obj->rowid.'">'.img_delete($langs->trans("RemoveRecipient")).'</td>'; print '<td><a href="cibles.php?action=delete&id='.$mil->id.'&rowid='.$obj->rowid.'">'.img_delete($langs->trans("RemoveRecipient")).'</td>';
} }
if ($mil->statut != 0) if ($mil->statut != 0)
{ {
print '<td>'; print '<td align="center">';
if ($obj->statut==-1) print $langs->trans("MailingStatusError"); if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error();
if ($obj->statut==1) print $langs->trans("MailingStatusSent"); if ($obj->statut==1) print $langs->trans("MailingStatusSent");
print '</td>'; print '</td>';
print '<td>'.$obj->date_envoi.'</td>'; print '<td align="center">'.$obj->date_envoi.'</td>';
} }
print '</tr>'; print '</tr>';
@ -323,5 +324,5 @@ if ($mil->fetch($_GET["id"]) == 0)
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

8
htdocs/comm/mailing/fiche.php
View File

@ -316,11 +316,9 @@ else
if ($mil->statut > 1) if ($mil->statut > 1)
{ {
$ua = new User($db, $mil->user_appro); print '<tr><td>'.$langs->trans("SentBy").'</td><td>'.$langs->trans("Unknown").'</td>';
$ua->fetch();
print '<tr><td>'.$langs->trans("SentBy").'</td><td>'.$ua->fullname.'</td>';
print '<td>'.$langs->trans("Date").'</td>'; print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.strftime("%d %b %Y %H:%M", $mil->date_appro).'</td></tr>'; print '<td>'.strftime("%d %b %Y %H:%M", $mil->date_envoi).'</td></tr>';
} }
// Contenu du mail // Contenu du mail
@ -426,5 +424,5 @@ else
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

9
htdocs/comm/mailing/index.php
View File

@ -46,12 +46,11 @@ llxHeader('','Mailing');
* *
*/ */
print_titre($langs->trans("MailingArea")); print_fiche_titre($langs->trans("MailingArea"));
print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="notopnoleftnoright" width="100%">';
print '<tr><td valign="top" width="30%">'; print '<tr><td valign="top" width="30%" class="notopnoleft">';
// Recherche emails // Recherche emails
@ -138,7 +137,7 @@ closedir($handle);
print "</table><br>"; print "</table><br>";
print '</td><td valign="top" width="70%">'; print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
/* /*

6
htdocs/comm/mailing/mailing.class.php
View File

@ -71,7 +71,8 @@ class Mailing
$this->statuts[0] = $langs->trans("MailingStatusDraft"); $this->statuts[0] = $langs->trans("MailingStatusDraft");
$this->statuts[1] = $langs->trans("MailingStatusValidated"); $this->statuts[1] = $langs->trans("MailingStatusValidated");
$this->statuts[2] = $langs->trans("MailingStatusSent"); $this->statuts[2] = $langs->trans("MailingStatusSentPartialy");
$this->statuts[3] = $langs->trans("MailingStatusSentCompletely");
} }
/** /**
@ -174,7 +175,7 @@ class Mailing
$sql .= ", m.fk_user_creat, m.fk_user_valid, m.fk_user_appro"; $sql .= ", m.fk_user_creat, m.fk_user_valid, m.fk_user_appro";
$sql .= ", ".$this->db->pdate("m.date_creat") . " as date_creat"; $sql .= ", ".$this->db->pdate("m.date_creat") . " as date_creat";
$sql .= ", ".$this->db->pdate("m.date_valid") . " as date_valid"; $sql .= ", ".$this->db->pdate("m.date_valid") . " as date_valid";
$sql .= ", ".$this->db->pdate("m.date_appro") . " as date_appro"; $sql .= ", ".$this->db->pdate("m.date_envoi") . " as date_envoi";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
$sql .= " WHERE m.rowid = ".$rowid; $sql .= " WHERE m.rowid = ".$rowid;
@ -202,6 +203,7 @@ class Mailing
$this->date_creat = $obj->date_creat; $this->date_creat = $obj->date_creat;
$this->date_valid = $obj->date_valid; $this->date_valid = $obj->date_valid;
$this->date_appro = $obj->date_appro; $this->date_appro = $obj->date_appro;
$this->date_envoi = $obj->date_envoi;
return 0; return 0;
} }