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

New: Add log tab on emailing module

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-29 18:41:39 +00:00
parent c19fbdac6e
commit 49eac8ee04
8 changed files with 173 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -29,6 +29,7 @@ For users:
from their email on gravatar.com. from their email on gravatar.com.
- New: Include Dolibarr version in suggested dump filename. - New: Include Dolibarr version in suggested dump filename.
- New: Enhancement in project module. - New: Enhancement in project module.
- New: Add log tab on emailing module.
- Fix: Error Call to a member function trans when refusing a supplier order. - Fix: Error Call to a member function trans when refusing a supplier order.
- Fix: Fix payment conditions on commercial proposals. - Fix: Fix payment conditions on commercial proposals.
- Fix: Nb of orders to process was wrong. - Fix: Nb of orders to process was wrong.

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

@ -25,9 +25,13 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
$langs->load("mails"); $langs->load("mails");
// Security check
if (! $user->rights->mailing->lire || $user->societe_id > 0) if (! $user->rights->mailing->lire || $user->societe_id > 0)
accessforbidden(); accessforbidden();
@ -150,28 +154,15 @@ if ($_POST["button_removefilter"])
llxHeader("","",$langs->trans("MailCard")); llxHeader("","",$langs->trans("MailCard"));
$html = new Form($db);
$mil = new Mailing($db); $mil = new Mailing($db);
$html = new Form($db);
if ($mil->fetch($_REQUEST["id"]) >= 0) if ($mil->fetch($_REQUEST["id"]) >= 0)
{ {
$head = emailing_prepare_head($mil);
$h=0; dol_fiche_head($head, 'targets', $langs->trans("Mailing"), 0, 'email');
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailCard");
$h++;
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailRecipients");
$hselected = $h;
$h++;
/*
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailHistory");
$h++;
*/
dol_fiche_head($head, $hselected, $langs->trans("Mailing"));
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -180,10 +171,22 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
print '<td colspan="3">'; print '<td colspan="3">';
print $html->showrefnav($mil,'id'); print $html->showrefnav($mil,'id');
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$mil->titre.'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$mil->titre.'</td></tr>';
print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.htmlentities($mil->email_from).'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.htmlentities($mil->email_from).'</td></tr>';
// Errors to
print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.htmlentities($mil->email_errorsto);
if (! empty($mil->email_errorsto) && ! isValidEMail($mil->email_errorsto)) print img_warning($langs->trans("BadEMail"));
print '</td></tr>';
// Status
print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$mil->getLibStatut(4).'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$mil->getLibStatut(4).'</td></tr>';
// Nb of distinct emails
print '<tr><td width="25%">'.$langs->trans("TotalNbOfDistinctRecipients").'</td><td colspan="3">'.($mil->nbemail?$mil->nbemail:'0').'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("TotalNbOfDistinctRecipients").'</td><td colspan="3">'.($mil->nbemail?$mil->nbemail:'0').'</td></tr>';
print '</table>'; print '</table>';
print "</div>"; print "</div>";
@ -195,15 +198,14 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
// Affiche les listes de selection // Affiche les listes de selection
if ($mil->statut == 0) if ($mil->statut == 0)
{ {
print_titre($langs->trans("ToAddRecipientsChooseHere")); print_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),'');
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("RecipientSelectionModules"); print '<td class="liste_titre">'.$langs->trans("RecipientSelectionModules").'</td>';
if ($user->admin) print ' '.info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1); print '<td class="liste_titre" align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
print '</td>'; print '<td class="liste_titre" align="left">'.$langs->trans("Filter").'</td>';
print '<td align="center">'.$langs->trans("NbOfUniqueEMails").'</td>'; print '<td class="liste_titre" align="center">&nbsp;</td>';
print '<td align="left">'.$langs->trans("Filter").'</td>';
print '<td align="center" width="120">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
clearstatcache(); clearstatcache();
@ -317,7 +319,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
print_titre($langs->trans("ToClearAllRecipientsClickHere")); print_titre($langs->trans("ToClearAllRecipientsClickHere"));
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("TargetsReset").'"></td>'; print '<td class="liste_titre" align="right"><input type="submit" class="button" value="'.$langs->trans("TargetsReset").'"></td>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';
print '</form>'; print '</form>';
@ -367,7 +369,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
// Date // Date
if ($mil->statut < 2) if ($mil->statut < 2)
{ {
print '<td>&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
} }
else else
{ {

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

@ -25,6 +25,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/mailing/mailing.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/mailing/mailing.class.php");
@ -526,22 +527,9 @@ else
{ {
if ($mil->fetch($_GET["id"]) >= 0) if ($mil->fetch($_GET["id"]) >= 0)
{ {
$h=0; $head = emailing_prepare_head($mil);
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailCard");
$hselected = $h;
$h++;
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$mil->id; dol_fiche_head($head, 'card', $langs->trans("Mailing"), 0, 'email');
$head[$h][1] = $langs->trans('MailRecipients');
$h++;
/*
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailHistory");
$h++;
*/
dol_fiche_head($head, $hselected, $langs->trans("Mailing"));
// Confirmation de la validation du mailing // Confirmation de la validation du mailing
if ($_GET["action"] == 'valide') if ($_GET["action"] == 'valide')
@ -601,34 +589,18 @@ else
print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.htmlentities($mil->email_from); print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.htmlentities($mil->email_from);
if (! isValidEMail($mil->email_from)) print img_warning($langs->trans("BadEMail")); if (! isValidEMail($mil->email_from)) print img_warning($langs->trans("BadEMail"));
print '</td></tr>'; print '</td></tr>';
// Errors to
print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.htmlentities($mil->email_errorsto); print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.htmlentities($mil->email_errorsto);
if (! empty($mil->email_errorsto) && ! isValidEMail($mil->email_errorsto)) print img_warning($langs->trans("BadEMail")); if (! empty($mil->email_errorsto) && ! isValidEMail($mil->email_errorsto)) print img_warning($langs->trans("BadEMail"));
print '</td></tr>'; print '</td></tr>';
// Status
print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$mil->getLibStatut(4).'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$mil->getLibStatut(4).'</td></tr>';
// Nb of distinct emails
print '<tr><td width="25%">'.$langs->trans("TotalNbOfDistinctRecipients").'</td><td colspan="3">'.($mil->nbemail?$mil->nbemail:'<font class="error">'.$langs->trans("NoTargetYet").'</font>').'</td></tr>'; print '<tr><td width="25%">'.$langs->trans("TotalNbOfDistinctRecipients").'</td><td colspan="3">'.($mil->nbemail?$mil->nbemail:'<font class="error">'.$langs->trans("NoTargetYet").'</font>').'</td></tr>';
$uc = new User($db, $mil->user_creat);
$uc->fetch();
print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>'.$uc->getNomUrl(1).'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.dol_print_date($mil->date_creat,"dayhour").'</td></tr>';
if ($mil->statut > 0)
{
$uv = new User($db, $mil->user_valid);
$uv->fetch();
print '<tr><td>'.$langs->trans("ValidatedBy").'</td><td>'.$uv->getNomUrl(1).'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.dol_print_date($mil->date_valid,"dayhour").'</td></tr>';
}
if ($mil->statut > 1)
{
print '<tr><td>'.$langs->trans("SentBy").'</td><td>'.$langs->trans("Unknown").'</td>';
print '<td>'.$langs->trans("Date").'</td>';
print '<td>'.dol_print_date($mil->date_envoi,"dayhour").'</td></tr>';
}
// Subject // Subject
print '<tr><td>'.$langs->trans("MailTopic").'</td><td colspan="3">'.$mil->sujet.'</td></tr>'; print '<tr><td>'.$langs->trans("MailTopic").'</td><td colspan="3">'.$mil->sujet.'</td></tr>';

69
htdocs/comm/mailing/info.php Normal file
View File

@ -0,0 +1,69 @@
<?php
/* Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/comm/mailing/info.php
* \ingroup mailing
* \brief Page with log information for emailing
* \version $Id$
*/
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
$langs->load("mails");
// Security check
if (! $user->rights->mailing->lire || $user->societe_id > 0)
accessforbidden();
/*
* View
*/
llxHeader();
$html = new Form($db);
$mil = new Mailing($db);
if ($mil->fetch($_REQUEST["id"]) >= 0)
{
$head = emailing_prepare_head($mil);
dol_fiche_head($head, 'info', $langs->trans("Mailing"), 0, 'email');
print '<table width="100%"><tr><td>';
$mil->user_creation=$mil->user_creat;
$mil->date_creation=$mil->date_creat;
$mil->user_validation=$mil->user_valid;
$mil->date_validation=$mil->date_valid;
dol_print_object_info($mil);
print '</td></tr></table>';
print '</div>';
}
$db->close();
llxFooter('$Date$ - $Revision$');
?>

10
htdocs/includes/modules/mailings/kiwi.modules.php
View File

@ -10,10 +10,10 @@
*/ */
/** /**
\file htdocs/includes/modules/mailings/kiwi.modules.php * \file htdocs/includes/modules/mailings/kiwi.modules.php
\ingroup mailing * \ingroup mailing
\brief Example file to provide a list of recipients for mailing module * \brief Example file to provide a list of recipients for mailing module
\version $Revision$ * \version $Revision$
*/ */
include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
@ -181,7 +181,7 @@ class mailing_kiwi extends MailingTargets
$type=''; $type='';
if ($obj->type == 1) $type=$langs->trans("Supplier"); if ($obj->type == 1) $type=$langs->trans("Supplier");
if ($obj->type == 2) $type=$langs->trans("Customer"); if ($obj->type == 2) $type=$langs->trans("Customer");
$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,48,'middle'); $s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
if ($type) $s.=' ('.$type.')'; if ($type) $s.=' ('.$type.')';
$s.='</option>'; $s.='</option>';
$i++; $i++;

1
htdocs/langs/en_US/mails.lang
View File

@ -66,6 +66,7 @@ CloneEMailing=Clone Emailing
ConfirmCloneEMailing=Are you sure you want to clone this emailing ? ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
CloneContent=Clone message CloneContent=Clone message
CloneReceivers=Cloner recipients CloneReceivers=Cloner recipients
DateLastSend=Date of last sending
# Libelle des modules de liste de destinataires mailing # Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contacts of all third parties (customer, prospect, supplier, ...) MailingModuleDescContactCompanies=Contacts of all third parties (customer, prospect, supplier, ...)

5
htdocs/langs/fr_FR/mails.lang
View File

@ -50,7 +50,7 @@ ConfirmValidMailing=Confirmez-vous la validation du mailing ?
ConfirmResetMailing=Attention, en réinitialisation le mailing <b>%s</b>, vous autorisez son émission en masse une nouvelle fois. Est-ce bien ce que vous voulez faire ? ConfirmResetMailing=Attention, en réinitialisation le mailing <b>%s</b>, vous autorisez son émission en masse une nouvelle fois. Est-ce bien ce que vous voulez faire ?
ConfirmDeleteMailing=Confirmez-vous la suppression du mailing ? ConfirmDeleteMailing=Confirmez-vous la suppression du mailing ?
NbOfRecipients=Nombre de destinataires NbOfRecipients=Nombre de destinataires
NbOfUniqueEMails=Nb d'e-mails uniques NbOfUniqueEMails=Nb d'emails uniques
NbOfEMails=Nbre d'EMails NbOfEMails=Nbre d'EMails
TotalNbOfDistinctRecipients=Nombre de destinataires uniques TotalNbOfDistinctRecipients=Nombre de destinataires uniques
NoTargetYet=Aucun destinataire défini (Aller sur l'onglet Destinataires) NoTargetYet=Aucun destinataire défini (Aller sur l'onglet Destinataires)
@ -66,6 +66,7 @@ CloneEMailing=Cloner Emailing
ConfirmCloneEMailing=Etes-vous sur de vouloir cloner cet emailing ? ConfirmCloneEMailing=Etes-vous sur de vouloir cloner cet emailing ?
CloneContent=Cloner message CloneContent=Cloner message
CloneReceivers=Cloner destinataires CloneReceivers=Cloner destinataires
DateLastSend=Date du dernier envoi
# Libelle des modules de liste de destinataires mailing # Libelle des modules de liste de destinataires mailing
MailingModuleDescContactCompanies=Contacts des tiers (prospects, clients, fournisseurs...) MailingModuleDescContactCompanies=Contacts des tiers (prospects, clients, fournisseurs...)
@ -91,7 +92,7 @@ MailingNeedCommand=Pour des raisons de sécurité, il est recommandé de faire l
MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer en ligne en ajoutant le parametre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre max de mails envoyés par session d'envoi. MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer en ligne en ajoutant le parametre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre max de mails envoyés par session d'envoi.
ConfirmSendingEmailing=Confirmez-vous l'envoi de l'emailing ?<br>L'envoi en ligne des emailings sont limités par sécurité à <b>%s</b> destinataires par session d'envoi. ConfirmSendingEmailing=Confirmez-vous l'envoi de l'emailing ?<br>L'envoi en ligne des emailings sont limités par sécurité à <b>%s</b> destinataires par session d'envoi.
TargetsReset=Vider liste TargetsReset=Vider liste
ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de ce mailing, cliquer le bouton ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquer le bouton
ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous
NbOfEMailingsReceived=EMailings de masse reçus NbOfEMailingsReceived=EMailings de masse reçus
IdRecord=ID enregistrement IdRecord=ID enregistrement

57
htdocs/lib/emailing.lib.php Normal file
View File

@ -0,0 +1,57 @@
<?php
/* Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* or see http://www.gnu.org/
*/
/**
* \file htdocs/lib/emailing.lib.php
* \brief Library file with function for emailing module
* \version $Id$
*/
/**
* Enter description here...
*
* @param unknown_type $contrat
* @return unknown
*/
function emailing_prepare_head($mil)
{
global $langs, $conf;
$h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailCard");
$head[$h][2] = 'card';
$h++;
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$mil->id;
$head[$h][1] = $langs->trans("MailRecipients");
$head[$h][2] = 'targets';
$h++;
$head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$mil->id;
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
return $head;
}
?>