FIX #6010
This commit is contained in:
parent
cbd85f7b82
commit
5b49b7bca0
@ -51,6 +51,13 @@ $langs->load("companies");
|
|||||||
$langs->load("paybox");
|
$langs->load("paybox");
|
||||||
$langs->load("paypal");
|
$langs->load("paypal");
|
||||||
|
|
||||||
|
$PAYPALTOKEN=GETPOST('TOKEN');
|
||||||
|
if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
|
||||||
|
$PAYPALPAYERID=GETPOST('PAYERID');
|
||||||
|
if (empty($PAYPALPAYERID)) $PAYPALPAYERID=GETPOST('PayerID');
|
||||||
|
$PAYPALFULLTAG=GETPOST('FULLTAG');
|
||||||
|
if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Actions
|
* Actions
|
||||||
@ -73,6 +80,18 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
|
|||||||
// Send an email
|
// Send an email
|
||||||
if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
|
if (! empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL))
|
||||||
{
|
{
|
||||||
|
// Get on url call
|
||||||
|
$token = $PAYPALTOKEN;
|
||||||
|
$fulltag = $PAYPALFULLTAG;
|
||||||
|
$payerID = $PAYPALPAYERID;
|
||||||
|
// Set by newpayment.php
|
||||||
|
$paymentType = $_SESSION['PaymentType'];
|
||||||
|
$currencyCodeType = $_SESSION['currencyCodeType'];
|
||||||
|
$FinalPaymentAmt = $_SESSION["Payment_Amount"];
|
||||||
|
// From env
|
||||||
|
$ipaddress = $_SESSION['ipaddress'];
|
||||||
|
|
||||||
|
|
||||||
$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
|
$sendto=$conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
|
||||||
$from=$conf->global->MAILING_EMAIL_FROM;
|
$from=$conf->global->MAILING_EMAIL_FROM;
|
||||||
|
|
||||||
@ -102,11 +121,6 @@ print '<span id="dolpaymentspan"></span>'."\n";
|
|||||||
print '<div id="dolpaymentdiv" align="center">'."\n";
|
print '<div id="dolpaymentdiv" align="center">'."\n";
|
||||||
print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
|
print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
|
||||||
|
|
||||||
$PAYPALTOKEN=GETPOST('TOKEN');
|
|
||||||
if (empty($PAYPALTOKEN)) $PAYPALTOKEN=GETPOST('token');
|
|
||||||
$PAYPALFULLTAG=GETPOST('FULLTAG');
|
|
||||||
if (empty($PAYPALFULLTAG)) $PAYPALFULLTAG=GETPOST('fulltag');
|
|
||||||
|
|
||||||
if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSAGE_KO;
|
if (! empty($conf->global->PAYPAL_MESSAGE_KO)) print $conf->global->PAYPAL_MESSAGE_KO;
|
||||||
print "\n</div>\n";
|
print "\n</div>\n";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user