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

Fix: Email html format was missing br.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-07 10:05:32 +02:00
parent 95b5094e94
commit 3122944ab7
2 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/public/paybox/paymentok.php
View File

@ -111,12 +111,24 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
$urlback=$_SERVER["REQUEST_URI"]; $urlback=$_SERVER["REQUEST_URI"];
$topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived"); $topic='['.$conf->global->MAIN_APPLICATION_TITLE.'] '.$langs->transnoentitiesnoconv("NewPayboxPaymentReceived");
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
$content=""; $content="";
$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."\n"; if (! empty($tmptag['MEM']))
$content.="\n"; {
$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n"; $langs->load("members");
$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n"; $url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
$content.="tag=".$fulltag."\n"; $content.=$langs->trans("PaymentSubscription")."<br>\n";
$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
}
else
{
$content.=$langs->transnoentitiesnoconv("NewPayboxPaymentReceived")."<br>\n";
}
$content.="<br>\n";
$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
$content.="tag=".$fulltag."<br>\n";
$ishtml=dol_textishtml($content); // May contain urls $ishtml=dol_textishtml($content); // May contain urls

14
htdocs/public/paypal/paymentok.php
View File

@ -186,17 +186,17 @@ if ($PAYPALTOKEN)
{ {
$langs->load("members"); $langs->load("members");
$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM']; $url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
$content.=$langs->trans("PaymentSubscription")."\n"; $content.=$langs->trans("PaymentSubscription")."<br>\n";
$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."\n"; $content.=$langs->trans("MemberId").': '.$tmptag['MEM']."<br>\n";
$content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."\n"; $content.=$langs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
} }
else else
{ {
$content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."\n"; $content.=$langs->transnoentitiesnoconv("NewPaypalPaymentReceived")."<br>\n";
} }
$content.="\n"; $content.="<br>\n";
$content.=$langs->transnoentitiesnoconv("TechnicalInformation").":\n"; $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n";
$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n"; $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt; $content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
$ishtml=dol_textishtml($content); // May contain urls $ishtml=dol_textishtml($content); // May contain urls