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

Fix title of emails sents on payment

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-18 23:31:32 +02:00
parent 8d82307956
commit 2101611bd5
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/public/payment/paymentko.php
View File

@ -135,6 +135,10 @@ foreach ($_POST as $k => $v) {
dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment'); dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
// Set $appli for emails title
$appli = $mysoc->name;
if (!empty($_SESSION['ipaddress'])) { // To avoid to make action twice if (!empty($_SESSION['ipaddress'])) { // To avoid to make action twice
// Get on url call // Get on url call
$fulltag = $FULLTAG; $fulltag = $FULLTAG;
@ -172,21 +176,6 @@ if (!empty($_SESSION['ipaddress'])) { // To avoid to make action twice
$from = $conf->global->MAILING_EMAIL_FROM; $from = $conf->global->MAILING_EMAIL_FROM;
$sendto = $sendemail; $sendto = $sendemail;
// Define link to login card
$appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
$appli = $conf->global->MAIN_APPLICATION_TITLE;
if (preg_match('/\d\.\d/', $appli)) {
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
}
} else {
$appli .= " ".DOL_VERSION;
}
} else {
$appli .= " ".DOL_VERSION;
}
$urlback = $_SERVER["REQUEST_URI"]; $urlback = $_SERVER["REQUEST_URI"];
$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed"); $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
$content = ""; $content = "";

5
htdocs/public/payment/paymentok.php
View File

@ -1542,10 +1542,7 @@ if ($ispaymentok) {
// Set $appli for emails title // Set $appli for emails title
$appli = constant('DOL_APPLICATION_TITLE'); $appli = $mysoc->name;
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
$appli = $conf->global->MAIN_APPLICATION_TITLE;
}
if ($ispaymentok) { if ($ispaymentok) {